summaryrefslogtreecommitdiff
path: root/addons/purchase/i18n
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2014-10-08 17:52:25 +0200
committerOlivier Dony <odo@openerp.com>2014-10-08 17:52:25 +0200
commit7439421ad26332fc5b8f5818c98367b908893bed (patch)
tree9e4c77481fe64122129bb2ebc2566f6ee13661bc /addons/purchase/i18n
parent99d740ad7d7dc6c3cc066c4b79c735b86799c1d0 (diff)
[I18N] Update translations from Launchpad 8.0 branches
Diffstat (limited to 'addons/purchase/i18n')
-rw-r--r--addons/purchase/i18n/ar.po317
-rw-r--r--addons/purchase/i18n/bg.po314
-rw-r--r--addons/purchase/i18n/bs.po333
-rw-r--r--addons/purchase/i18n/ca.po317
-rw-r--r--addons/purchase/i18n/cs.po317
-rw-r--r--addons/purchase/i18n/da.po317
-rw-r--r--addons/purchase/i18n/de.po489
-rw-r--r--addons/purchase/i18n/el.po314
-rw-r--r--addons/purchase/i18n/en_GB.po317
-rw-r--r--addons/purchase/i18n/es.po424
-rw-r--r--addons/purchase/i18n/es_AR.po314
-rw-r--r--addons/purchase/i18n/es_BO.po314
-rw-r--r--addons/purchase/i18n/es_CL.po317
-rw-r--r--addons/purchase/i18n/es_CO.po314
-rw-r--r--addons/purchase/i18n/es_CR.po317
-rw-r--r--addons/purchase/i18n/es_EC.po317
-rw-r--r--addons/purchase/i18n/es_MX.po314
-rw-r--r--addons/purchase/i18n/es_PE.po314
-rw-r--r--addons/purchase/i18n/et.po314
-rw-r--r--addons/purchase/i18n/fi.po335
-rw-r--r--addons/purchase/i18n/fr.po333
-rw-r--r--addons/purchase/i18n/fr_CA.po314
-rw-r--r--addons/purchase/i18n/gl.po314
-rw-r--r--addons/purchase/i18n/hr.po331
-rw-r--r--addons/purchase/i18n/hu.po335
-rw-r--r--addons/purchase/i18n/id.po317
-rw-r--r--addons/purchase/i18n/it.po343
-rw-r--r--addons/purchase/i18n/ja.po317
-rw-r--r--addons/purchase/i18n/ko.po314
-rw-r--r--addons/purchase/i18n/lt.po317
-rw-r--r--addons/purchase/i18n/lv.po317
-rw-r--r--addons/purchase/i18n/mk.po333
-rw-r--r--addons/purchase/i18n/mn.po331
-rw-r--r--addons/purchase/i18n/nb.po319
-rw-r--r--addons/purchase/i18n/nl.po436
-rw-r--r--addons/purchase/i18n/nl_BE.po317
-rw-r--r--addons/purchase/i18n/pl.po331
-rw-r--r--addons/purchase/i18n/pt.po343
-rw-r--r--addons/purchase/i18n/pt_BR.po331
-rw-r--r--addons/purchase/i18n/ro.po335
-rw-r--r--addons/purchase/i18n/ru.po317
-rw-r--r--addons/purchase/i18n/sk.po314
-rw-r--r--addons/purchase/i18n/sl.po317
-rw-r--r--addons/purchase/i18n/sq.po314
-rw-r--r--addons/purchase/i18n/sr.po314
-rw-r--r--addons/purchase/i18n/sr@latin.po314
-rw-r--r--addons/purchase/i18n/sv.po317
-rw-r--r--addons/purchase/i18n/th.po317
-rw-r--r--addons/purchase/i18n/tlh.po314
-rw-r--r--addons/purchase/i18n/tr.po335
-rw-r--r--addons/purchase/i18n/uk.po314
-rw-r--r--addons/purchase/i18n/vi.po314
-rw-r--r--addons/purchase/i18n/zh_CN.po341
-rw-r--r--addons/purchase/i18n/zh_TW.po317
54 files changed, 9357 insertions, 8359 deletions
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 8a175927d5c..78204cc33a0 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic <ar@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: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "عدد السطور"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "عدد طلبات الشراء"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} أمر (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(تحديث)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "عدد السطور"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "عدد طلبات الشراء"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} أمر (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(تحديث)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "متوسط السعر"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr "يمكن أن تُشترى"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "ملغي"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "فئة"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "إعدادات"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "وصف"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "المقصد"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr "طلب شراء 'مسودة'"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "تم انشاء طلب شراء 'مسودة'"
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "خطأ!"
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "الوضع المالي"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr "تم استلام الفاتورة"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr "الرسائل و سجل التواصل"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "السعر الصافي"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr "فتح قائمة الشراء"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "تاريخ الأمر"
@@ -1279,6 +1287,7 @@ msgstr "سطور الأوامر"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr "رسائل البريد الصادر"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "إصدار فواتير 'مسودة' على أساس طلبات الشراء"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "أنواع السعر"
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "المنتج"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "المنتجات بالتصنيف"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1575,7 +1588,7 @@ msgid "Purchase Pricelist"
msgstr "قائمة اسعار الشراء"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1625,12 +1638,11 @@ msgstr "الكمية"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "كمية"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1669,7 +1681,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1722,11 +1734,6 @@ msgid "Reference"
msgstr "مرجع"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "وحة القياس للمرجع"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "مرجع وحدة القياس (UOM)"
@@ -1810,7 +1817,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1899,7 +1906,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1907,7 +1914,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "فواتير الموردين"
@@ -1949,7 +1956,7 @@ msgstr ""
"للمنتجات المختارة/الكميات."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1957,7 +1964,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1965,7 +1972,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "يقوم بالبيع لهذا المنتج المود المختار فقط بواسطة %s"
@@ -1993,7 +2000,7 @@ msgid "The total amount"
msgstr "المبلغ الكلي"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2057,13 +2064,13 @@ msgid "Total amount"
msgstr "الكمية الكلية"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "لم نتمكن من إلغاء طلب الشراء"
@@ -2082,6 +2089,11 @@ msgid "Unit Price"
msgstr "سعر الوحدة"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "فئات وحدة القياس"
@@ -2145,7 +2157,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "تم التحقق من الصلاحية عن طريق"
@@ -2161,15 +2172,14 @@ msgstr "انتظار اقرار المورد"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "المخزن"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2197,7 +2207,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "لا يمكنك تأكيد طلب شراء بدون خطوط شراء (أصناف)"
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "يجب عليك أولا إلغاء جميع الفواتير المتعلقة بهذا أمر الشراء."
@@ -2206,3 +2222,6 @@ msgstr "يجب عليك أولا إلغاء جميع الفواتير المتع
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "مرجع الامر الخاص بك"
+
+#~ msgid "Reference UOM"
+#~ msgstr "وحة القياس للمرجع"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 6207dddd663..446fc060b95 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bulgarian <bg@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: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# от редове"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# от редове"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Средна цена"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Отказани"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Категория"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Настройка"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Описание"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Назначение"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Нетна цена"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Дата на поръчка"
@@ -1279,6 +1287,7 @@ msgstr "Редове от поръчка"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Продукт"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Продукти по категория"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "К-во"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Препратка"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Фактури на доставчици"
@@ -1947,7 +1954,7 @@ msgstr ""
"изчислява доставната цена за избраните продукти / количества."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2056,13 +2063,13 @@ msgid "Total amount"
msgstr "Обща сума"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2081,6 +2088,11 @@ msgid "Unit Price"
msgstr "Единична цена"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2144,7 +2156,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Одобрено от"
@@ -2160,15 +2171,14 @@ msgstr "Чака потвърждение от доставчик"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2196,7 +2206,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 9c064af6855..ec49a2c9f7b 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bosnian <bs@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: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * 'U pripremi' status je postavljen automatski kada je nabavna narudžba u "
-"pripremi.\n"
-" * 'Potvrđeno' status je postavljen automatski kada je nabavna narudžba "
-"potvrđena.\n"
-" * 'Gotov' status je postavljen automatski kada je nabavna narudžba "
-"postavljena kao gotova.\n"
-" * 'Otkazano' status je postavljen automatski kada je nabavna narudžba "
-"otkazana od strane korisnika."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Br. Stavki"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Br. nabavnih narudžbi"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Narudžba (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(osvježi)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * 'U pripremi' status je postavljen automatski kada je nabavna narudžba u "
+"pripremi.\n"
+" * 'Potvrđeno' status je postavljen automatski kada je nabavna narudžba "
+"potvrđena.\n"
+" * 'Gotov' status je postavljen automatski kada je nabavna narudžba "
+"postavljena kao gotova.\n"
+" * 'Otkazano' status je postavljen automatski kada je nabavna narudžba "
+"otkazana od strane korisnika."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Br. Stavki"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Br. nabavnih narudžbi"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Narudžba (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(osvježi)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -528,6 +530,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Prosječna cijena"
@@ -585,8 +592,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -614,7 +621,7 @@ msgid "Can be Purchased"
msgstr "Može se kupovati"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -635,18 +642,22 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "kategorija"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -676,7 +687,7 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Greška u konfiguraciji!"
@@ -838,7 +849,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Odredište"
@@ -873,7 +883,7 @@ msgid "Draft PO"
msgstr "NN u pripremi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Nabavni nalog u pripremi kreiran"
@@ -899,7 +909,7 @@ msgstr "Čarobnjak sastavljanja email-a"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Greška!"
@@ -929,12 +939,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -1040,7 +1044,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Ne pravilna akcija"
@@ -1077,13 +1081,13 @@ msgid "Invoice Received"
msgstr "Faktura primljena"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1246,6 +1250,11 @@ msgid "Messages and communication history"
msgstr "Istorija poruka i komunikacije"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Neto cijena"
@@ -1256,19 +1265,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nije definisana adresa dobavljača"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Nema zadanog dobavljača definisanog na ovom proizvodu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nema definisanog dobavljača za ovaj proizvod !"
@@ -1311,7 +1320,6 @@ msgstr "Otvori meni nabavke"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Datum narudžbe"
@@ -1328,6 +1336,7 @@ msgstr "Stavke narudžbe"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1369,7 +1378,7 @@ msgid "Outgoing Mails"
msgstr "Odlazni mail-ovi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "NN: %s"
@@ -1433,6 +1442,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "U napred generisane fakture u pripremi na nabavnim nalozima"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipovi cijena"
@@ -1475,7 +1489,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Proizvod"
@@ -1515,7 +1528,7 @@ msgid "Products by Category"
msgstr "Proizvodi po kategoriji"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1625,7 +1638,7 @@ msgid "Purchase Pricelist"
msgstr "Nabavni cijenovnik"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1677,12 +1690,11 @@ msgstr "Kol."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1721,7 +1733,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1774,11 +1786,6 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referentna JM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referentna jedinica mjere"
@@ -1864,7 +1871,7 @@ msgid "Select an Open Sales Order"
msgstr "Odaberi i otvori prodajnu narudžbu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1956,7 +1963,7 @@ msgid "Supplier Features"
msgstr "Karakteristike dobavljača"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1964,7 +1971,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Fakture dobavljača"
@@ -2006,7 +2013,7 @@ msgstr ""
"izračunava nabavnu cijenu za odabrane proizvode i količinu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2016,7 +2023,7 @@ msgstr ""
"čini kao greškom konfiguracije!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2026,7 +2033,7 @@ msgstr ""
"trebali kupovati manje."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Odabrani dobavljač samo prodaje ove proizvode po %s"
@@ -2054,7 +2061,7 @@ msgid "The total amount"
msgstr "Ukupni iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2121,13 +2128,13 @@ msgid "Total amount"
msgstr "Ukupni iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Ne mogu otkazati ovu nabavnu narudžbu."
@@ -2148,6 +2155,11 @@ msgid "Unit Price"
msgstr "Jedinična cijena"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Jedinica mjere kategorija"
@@ -2211,7 +2223,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Ovjerio"
@@ -2227,15 +2238,14 @@ msgstr "Čekanje na dobavljača"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2264,7 +2274,13 @@ msgstr ""
"Ne možete potvrditi nabavnu narudžbu koja ne sadrži niti jednu stavku."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2273,3 +2289,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Referenca vašeg narudžbe"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referentna JM"
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index b60615cebd0..47a35c2a3b8 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Catalan <ca@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: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# de línies"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de línies"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Preu mitjà"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Cancel·lada"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Configuració"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Descripció"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destí"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posició fiscal"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Preu net"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data comanda"
@@ -1279,6 +1287,7 @@ msgstr "Línies de la comanda"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producte"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Productes per categoria"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Tarifa de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Qtat"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantitat"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referència"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referència UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Factures de proveïdor"
@@ -1951,7 +1958,7 @@ msgstr ""
"el preu del proveïdor pels productes/quantitats seleccionats."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1967,7 +1974,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveïdor seleccionat només ven aquest producte per %s"
@@ -1995,7 +2002,7 @@ msgid "The total amount"
msgstr "Import total"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2062,13 +2069,13 @@ msgid "Total amount"
msgstr "Import total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2087,6 +2094,11 @@ msgid "Unit Price"
msgstr "Preu un."
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2150,7 +2162,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada per"
@@ -2166,15 +2177,14 @@ msgstr "Esperant acceptació proveïdor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Magatzem"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2202,7 +2212,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2211,3 +2227,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "La vostra referència"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referència UdM"
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 5246d0f9347..173c2c35f38 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Czech <cs@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: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# z řádek"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(aktualizovat)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# z řádek"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(aktualizovat)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Průměrná cena"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr "Lze koupit"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Zrušeno"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Nastavení"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Chyba nastavení!"
@@ -794,7 +805,6 @@ msgstr "Popis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Cíl"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr "Koncept objednávky"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Finanční pozice"
@@ -996,7 +1000,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1033,13 +1037,13 @@ msgid "Invoice Received"
msgstr "Obdržena faktura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1199,6 +1203,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Čista cena"
@@ -1209,19 +1218,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Pro výrobek nebyl zadán dodavatel !"
@@ -1264,7 +1273,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Datum objednání"
@@ -1281,6 +1289,7 @@ msgstr "Řádky objednávky"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1322,7 +1331,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1386,6 +1395,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Předgenerovat koncepty faktur na základě objednávek"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1428,7 +1442,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Výrobek"
@@ -1468,7 +1481,7 @@ msgid "Products by Category"
msgstr "Výrobky podle kategorie"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1578,7 +1591,7 @@ msgid "Purchase Pricelist"
msgstr "Ceník nákupů"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1628,12 +1641,11 @@ msgstr "Množ."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Množství"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1672,7 +1684,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1725,11 +1737,6 @@ msgid "Reference"
msgstr "Značka"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referenční MJ"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referenční měrná jednotka"
@@ -1813,7 +1820,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1904,7 +1911,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1912,7 +1919,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faktury dodavatele"
@@ -1954,7 +1961,7 @@ msgstr ""
"cenu zvolených výrobků/množství."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1962,7 +1969,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1970,7 +1977,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -1998,7 +2005,7 @@ msgid "The total amount"
msgstr "Celková částka"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2064,13 +2071,13 @@ msgid "Total amount"
msgstr "Celková částka"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2089,6 +2096,11 @@ msgid "Unit Price"
msgstr "Cena za kus"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Kategorie měrných jednotek"
@@ -2152,7 +2164,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Ověřeno"
@@ -2168,15 +2179,14 @@ msgstr "Čekání na potvrzení dodavatelem"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Sklad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2204,7 +2214,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2213,3 +2229,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Vaše značka objednávky"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referenční MJ"
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index ab5d259b988..e456bccfeb9 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# linjer"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# indkøbsordrer"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "Opdater (-ing)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# indkøbsordrer"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "Opdater (-ing)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -501,6 +503,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Gennemsnits pris"
@@ -558,8 +565,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -587,7 +594,7 @@ msgid "Can be Purchased"
msgstr "Kan indkøbes"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -608,18 +615,22 @@ msgid "Cancelled"
msgstr "Annulleret"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -649,7 +660,7 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Konfigurationsfejl!"
@@ -811,7 +822,6 @@ msgstr "Beskrivelse:"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destination"
@@ -846,7 +856,7 @@ msgid "Draft PO"
msgstr "Indkøbsordre kladde"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Indkøbsordre kladde oprettet"
@@ -872,7 +882,7 @@ msgstr "Wizard til at skrive Email"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Fejl!"
@@ -902,12 +912,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Regnskabs position"
@@ -1013,7 +1017,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Ulovlig handling!"
@@ -1050,13 +1054,13 @@ msgid "Invoice Received"
msgstr "Faktura modtaget"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1218,6 +1222,11 @@ msgid "Messages and communication history"
msgstr "Besked- og kommunikations historik"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Netto pris"
@@ -1228,19 +1237,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Ingen adresse angivet på leverandøren"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Der er ikke opsat standard leverandør på denne vare"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Ingen leverandør er angivet på denne vare!"
@@ -1283,7 +1292,6 @@ msgstr "Åbn indkøbsmenu"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Ordredato"
@@ -1300,6 +1308,7 @@ msgstr "Ordre linier"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1341,7 +1350,7 @@ msgid "Outgoing Mails"
msgstr "Udgående mails"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "Indkøbsordre: %s"
@@ -1405,6 +1414,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Dan proformafakturaer forud på indkøbsordrer"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Pristyper"
@@ -1447,7 +1461,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Vare"
@@ -1487,7 +1500,7 @@ msgid "Products by Category"
msgstr "Produkter pr. kategori"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1597,7 +1610,7 @@ msgid "Purchase Pricelist"
msgstr "Indkøbs prislister"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1649,12 +1662,11 @@ msgstr "Antal"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Antal"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1746,11 +1758,6 @@ msgid "Reference"
msgstr "Reference"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Reference enhed"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Reference enhed"
@@ -1836,7 +1843,7 @@ msgid "Select an Open Sales Order"
msgstr "Vælg en aktiv salgsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1925,7 +1932,7 @@ msgid "Supplier Features"
msgstr "Leverandør faciliteter"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1933,7 +1940,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Leverandørfakturaer"
@@ -1975,7 +1982,7 @@ msgstr ""
"også leverandørprisen ved det valgte anta."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1985,7 +1992,7 @@ msgstr ""
"være en opsætningsfejl!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1994,7 +2001,7 @@ msgstr ""
"Den valgte leverandør kræver minimumskøb på %s %s, du kan ikke købe mindre."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valgte leverandør sælger kun varen ved %s"
@@ -2022,7 +2029,7 @@ msgid "The total amount"
msgstr "Samlet beløb"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2089,13 +2096,13 @@ msgid "Total amount"
msgstr "Samlet beløb"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Kan ikke fortryde indkøbsordre"
@@ -2116,6 +2123,11 @@ msgid "Unit Price"
msgstr "Enhedspris"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Enheds-kategorier"
@@ -2179,7 +2191,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Godkendt af"
@@ -2195,15 +2206,14 @@ msgstr "Afventer leverandør bekræftelse"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Lagersted"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2231,7 +2241,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Du kan ikke bekræfte en indkøbsordre uden indkøbslinier."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2240,3 +2256,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Deres ordrereference"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Reference enhed"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index fceff569b8e..e7200460a01 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,87 +7,21 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-09-21 15:53+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-09-30 10:44+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: German <de@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: 2014-09-22 08:02+0000\n"
+"X-Launchpad-Export-Date: 2014-10-01 06:33+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-"\n"
-"Es kann eine Route für das Streckengeschäft erstellt werden.\n"
-"- Installieren Sie hierzu das Modul stock_dropshipping"
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Einkaufen"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "# Bestellungen"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "# Eingangsrechnungen"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Anzahl Positionen"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Anzahl Bestellungen"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name|safe} Bestellung (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(aktualisieren)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -98,28 +32,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -132,30 +66,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -164,38 +98,39 @@ msgid ""
"</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>Hallo ${object.partner_id.name},</p>\n"
" \n"
-" <p>hiermit senden wir Ihnen eine ${object.state in ('draft', 'sent') and "
-"'Angebotsanfrage' or 'Bestellung'} der Firma ${object.company_id.name}: "
-"</p>\n"
+" <p>hiermit senden wir Ihnen die ${object.state in ('draft', 'sent') and "
+"'request for quotation' or 'purchase order confirmation'} für "
+"${object.company_id.name}: </p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENZEN</strong><br>\n"
-"   Bestellnummer: <strong>${object.name}</strong><br>\n"
-"   Bestellbetrag: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Auftragsdatum: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENZEN</strong><br />\n"
+" &nbsp;&nbsp;Bestellnummer: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Betrag: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Datum: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Auftragsreferenz: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Unsere Referenz: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Ihre Referenz: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Ihre Referenz: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Ihr Ansprechpartner: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Bestellung ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Ihr Kontakt: <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>Bitte zögern Sie bei Fragen nicht, uns zu kontaktieren.</p>\n"
+" <br/>\n"
+" <p>Bei Fragen, kontaktieren Sie uns bitte.</p>\n"
" <p>Vielen Dank!</p>\n"
-" <br>\n"
-" <br>\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"
@@ -208,30 +143,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Tel.:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Webseite : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -243,6 +178,7 @@ 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"
@@ -253,26 +189,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -285,30 +221,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -317,35 +253,38 @@ msgid ""
"</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>Hallo ${object.partner_id.name},</p>\n"
" \n"
-" <p>hiermit senden wir eine ${object.state in ('draft', 'sent') and "
-"'Angebotsanfrage' or 'Bestellauftrag'} von ${object.company_id.name}: </p>\n"
+" <p>hiermit erhalten Sie die ${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"
-"   <strong>REFERENZEN</strong><br>\n"
-"   RFQ Nummer: <strong>${object.name}</strong><br>\n"
-"   RFQ Datum: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENZEN</strong><br />\n"
+" &nbsp;&nbsp;Angebotsanfrage: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Datum der Anfrage: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ Referenz: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Unsere Referenz: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Ihre Referenz: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Ihre Referenz: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Ihr Ansprechpartner: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Bestellung ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Ihr Ansprechpartner: <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>Bei Fragen zögern Sie bitte nicht uns zu kontaktieren.</p>\n"
-" <p>Thank you!</p>\n"
-" <br>\n"
-" <br>\n"
+" <br/>\n"
+" <p>Bitte kontaktieren Sie uns bei Fragen.</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"
@@ -358,30 +297,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Tel.:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Webseite : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -391,6 +330,81 @@ msgstr ""
" "
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+"\n"
+"Es kann eine Route für das Streckengeschäft erstellt werden.\n"
+"- Installieren Sie hierzu das Modul stock_dropshipping"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Der \"Entwurf \"-Status wird automatisch beim Entwurf einer Bestellung "
+"gesetzt und angezeigt.\n"
+"* Die \"Bestätigt\"-Status wird automatisch angezeigt, wenn eine Bestellung "
+"durch Bestätigung des Benutzers erfolgt ist.\n"
+"* Die \"Erledigt\" Status wird automatisch eingestellt, wenn eine Bestellung "
+"geliefert und bezahlt wurde.\n"
+"* Die \"Abgebrochen\"-Status wird automatisch gesetzt, wenn ein Benutzer "
+"z.B. eine Bestellung abbricht oder storniert."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Einkaufen"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "# Bestellungen"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "# Eingangsrechnungen"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# Positionen"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Anzahl Bestellungen"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name|safe} Bestellung (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(aktualisieren)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -658,7 +672,7 @@ msgstr "Adressbuch"
#. module: purchase
#: model:res.groups,name:purchase.group_advance_bidding
msgid "Advance bidding process"
-msgstr "Vorabpreisanfrage"
+msgstr "Ausschreibungen im Einkauf"
#. module: purchase
#: field:purchase.config.settings,module_warning:0
@@ -726,12 +740,12 @@ msgstr "Erlaubt die Spezifizierung von Kostenstellen bei Ihren Bestellungen."
#. module: purchase
#: field:purchase.order.line,account_analytic_id:0
msgid "Analytic Account"
-msgstr "Analytisches Konto"
+msgstr "Kostenstelle"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
msgid "Analytic Accounting for Purchases"
-msgstr "Kostenrechnung für Einkäufe"
+msgstr "Kostenrechnung für den Einkauf"
#. module: purchase
#: field:account.config.settings,group_analytic_account_for_purchases:0
@@ -766,6 +780,11 @@ msgid "Associated procurements"
msgstr "Verknüpfte Beschaffungsaufträge"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr "Durchschn. Lieferzeit"
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Durchschnittspreis"
@@ -816,21 +835,21 @@ msgstr "von Bestellpositionen"
#: view:purchase.order:purchase.purchase_order_form
#: selection:purchase.order,state:0
msgid "Bid Received"
-msgstr "Gebot erhalten"
+msgstr "Angebot erhalten"
#. module: purchase
#: field:purchase.order,bid_date:0
msgid "Bid Received On"
-msgstr "Gebot erhalten für"
+msgstr "Angebot erhalten für"
#. module: purchase
#: field:purchase.order,bid_validity:0
msgid "Bid Valid Until"
-msgstr "Gebot gültig bis"
+msgstr "Angebot gültig bis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "Einkaufen"
@@ -863,7 +882,7 @@ msgid "Can be Purchased"
msgstr "Kann eingekauft werden"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr "Es kann keine allgemein gültige Beschaffungsroute gefunden werden."
@@ -884,21 +903,25 @@ msgid "Cancelled"
msgstr "Abgebrochen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr "Es kann keine Bestellposition im Status '%s' gelöscht werden."
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr "Produktkategorie"
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
-msgstr "Auswählen aus Geboten einer Ausschreibung"
+msgstr "Auswählen aus Angeboten einer Ausschreibung"
#. module: purchase
#: model:ir.model,name:purchase.model_res_company
@@ -925,7 +948,7 @@ msgid "Configuration"
msgstr "Einstellungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Konfigurationsfehler!"
@@ -944,7 +967,7 @@ msgstr "Bestätigen"
#. module: purchase
#: view:purchase.order:purchase.purchase_order_form
msgid "Confirm Order"
-msgstr "Auftrag bestätigen"
+msgstr "Bestellung bestätigen"
#. module: purchase
#: selection:purchase.order.line,state:0
@@ -1012,12 +1035,12 @@ msgstr "Datum der Auftragsannahme"
#. module: purchase
#: help:purchase.order,bid_validity:0
msgid "Date on which the bid expired"
-msgstr "Auslaufdatum für Gebot"
+msgstr "Auslaufdatum des Angebots"
#. module: purchase
#: help:purchase.order,bid_date:0
msgid "Date on which the bid was received"
-msgstr "Empfangsdatum für Gebot"
+msgstr "Empfangsdatum für Angebot"
#. module: purchase
#: help:purchase.report,date:0
@@ -1042,7 +1065,7 @@ msgstr "Standard Einkaufspreisliste"
#. module: purchase
#: model:product.pricelist.version,name:purchase.ver0
msgid "Default Purchase Pricelist Version"
-msgstr "Standard Preislisten Version"
+msgstr "Standard Preislistenversion"
#. module: purchase
#: field:purchase.config.settings,default_invoice_method:0
@@ -1079,8 +1102,8 @@ msgid ""
"Depicts the date where the Quotation should be validated and converted into "
"a Purchase Order, by default it's the creation date."
msgstr ""
-"Ergänzt das Datum an dem die Angebotsanfrage bestätigt und in eine "
-"Bestellung umgewandelt wird, üblicherweise ist dies das gleichzeitig das "
+"Das Datum an dem die Angebotsanfrage bestätigt und in eine Bestellung "
+"umgewandelt werden soll, üblicherweise ist dies gleichzeitig das das "
"Erstellungsdatum."
#. module: purchase
@@ -1092,7 +1115,6 @@ msgstr "Beschreibung"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Zielort"
@@ -1129,7 +1151,7 @@ msgid "Draft PO"
msgstr "Entwurf Bestellung"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Entwurf für Bestellung wurde erstellt"
@@ -1155,7 +1177,7 @@ msgstr "E-Mail Assistent"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Fehler!"
@@ -1185,12 +1207,6 @@ msgid "Extended Filters"
msgstr "Erweiterte Filter"
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr "Löschen Sie zuerst alle Lieferscheine für diese Bestellung"
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Steuerliche Zuordnung"
@@ -1203,7 +1219,7 @@ msgstr "Followers"
#. module: purchase
#: field:purchase.config.settings,module_purchase_double_validation:0
msgid "Force two levels of approvals"
-msgstr "Doppelte Zustimmung ist zwingend"
+msgstr "Erzwingen Sie doppelte Bestellprüfungen"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
@@ -1302,7 +1318,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Ungültige Aktion!"
@@ -1339,13 +1355,13 @@ msgid "Invoice Received"
msgstr "Rechnung empfangen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "Rechnung bezahlt"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr "Rechnung erhalten"
@@ -1391,7 +1407,7 @@ msgstr "Rechnungsstellungsprozess"
#. module: purchase
#: view:purchase.config.settings:purchase.view_purchase_configuration
msgid "Invoicing Settings"
-msgstr "Einstellungen zur Rechnungserstellung"
+msgstr "Rechnungserstellung"
#. module: purchase
#: field:purchase.order,message_is_follower:0
@@ -1444,7 +1460,7 @@ msgstr "Lagerort & Lager"
#. module: purchase
#: field:purchase.config.settings,module_purchase_requisition:0
msgid "Manage calls for bids"
-msgstr "Managen Sie Gebote für Ausschreibungen"
+msgstr "Verwalten Sie einzelne Angebote für Ausschreibungen"
#. module: purchase
#: field:purchase.config.settings,group_uom:0
@@ -1459,7 +1475,7 @@ msgstr "Verwalten Sie Streckengeschäfte"
#. module: purchase
#: field:purchase.config.settings,group_purchase_pricelist:0
msgid "Manage pricelist per supplier"
-msgstr "Verwalte einzelne Preislisten für Lieferanten"
+msgstr "Verwalten Sie einzelne Preislisten für Lieferanten"
#. module: purchase
#: model:res.groups,name:purchase.group_purchase_manager
@@ -1505,7 +1521,12 @@ msgstr "Mitteilungen"
#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
-msgstr "Nachrichten und Kommunikation"
+msgstr "Nachrichten- und Kommunikationshistorie"
+
+#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr "Monatseinkäufe"
#. module: purchase
#: view:website:purchase.report_purchaseorder
@@ -1518,19 +1539,19 @@ msgid "New Mail"
msgstr "Neue E-Mail"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Keine Adresse für diesen Lieferanten definiert"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Kein Standardlieferant für dieses Produkt"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Kein Lieferant für dieses Produkt definiert!"
@@ -1573,7 +1594,6 @@ msgstr "Einkaufsmenü öffnen"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Bestelldatum"
@@ -1590,6 +1610,7 @@ msgstr "Bestellpositionen"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "Auftragsdatum"
@@ -1631,7 +1652,7 @@ msgid "Outgoing Mails"
msgstr "Postausgang"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1708,6 +1729,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Vorab Rechnungsentwurf durch Bestellung"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr "Preis nach Lieferant"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Preis Typen"
@@ -1750,7 +1776,6 @@ msgstr "Beschaffungsregel"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produkt"
@@ -1790,7 +1815,7 @@ msgid "Products by Category"
msgstr "Produkte nach Kategorien"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr "Produkte erhalten"
@@ -1802,8 +1827,8 @@ msgid ""
"amount.\n"
"-This installs the module purchase_double_validation."
msgstr ""
-"Nutzen Sie die Möglichkeit der doppelten Bestätigung für Bestellungen, die "
-"ein definiertes Maximum übersteigen.\n"
+"Nutzen Sie die Möglichkeit der doppelten Bestätigung für Bestellungen, wenn "
+"ein definierter Maximalbetrag überstiegen wird.\n"
"- Sie installieren das Modul purchase_double_validation."
#. module: purchase
@@ -1903,7 +1928,7 @@ msgid "Purchase Pricelist"
msgstr "Preisliste Einkauf"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1923,7 +1948,7 @@ msgstr "Einkauf zur Wiederauffüllung des Lagers"
#. module: purchase
#: field:purchase.report,negociation:0
msgid "Purchase-Standard Price"
-msgstr "Standard Einkaufs Preis"
+msgstr "Standard Einkaufspreis"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -1959,12 +1984,11 @@ msgstr "Anzahl"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Menge"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr "Hinzufügen einer Anzahl zu einer existierenden Auftragsposition"
@@ -2003,7 +2027,7 @@ msgstr "Anfrage ist erledigt"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "Anfrage wurde erstellt"
@@ -2056,11 +2080,6 @@ msgid "Reference"
msgstr "Referenz"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referenz ME"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Basis Mengeneinheit"
@@ -2149,7 +2168,7 @@ msgid "Select an Open Sales Order"
msgstr "Wählen Sie einen Auftrag aus"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -2177,7 +2196,7 @@ msgstr "Setze auf Entwurf"
#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Shipping Exception"
-msgstr "Versand Fehlerliste"
+msgstr "Lieferfehler"
#. module: purchase
#: view:website:purchase.report_purchaseorder
@@ -2240,18 +2259,18 @@ msgid "Supplier Features"
msgstr "Lieferanten Angebote"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
-msgstr "Lieferantenrechn."
+msgstr "Lieferanten Rechnung"
#. module: purchase
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
-msgstr "Eingangsrechnungen"
+msgstr "Rechnungen"
#. module: purchase
#: field:purchase.order,partner_ref:0
@@ -2263,7 +2282,7 @@ msgstr "Lieferantenreferenz"
#: field:purchase.order.line,taxes_id:0
#: view:website:purchase.report_purchaseorder
msgid "Taxes"
-msgstr "Umsatzsteuer"
+msgstr "Vorsteuer"
#. module: purchase
#: field:purchase.order,notes:0
@@ -2291,7 +2310,7 @@ msgstr ""
"unter Berücksichtigung der Bestellmenge errechnet."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2301,7 +2320,7 @@ msgstr ""
"definiert, was möglicherweise falsch ist!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2311,7 +2330,7 @@ msgstr ""
"können daher nicht weniger bestellen.."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -2329,13 +2348,12 @@ msgid ""
"exception."
msgstr ""
"Der Status der Bestellung oder der Anfrage eines Angebot. Eine Anfrage ist "
-"eine Bestellung im Status 'Entwurf' ('Anfrage eines Angebots') ! Bei "
-"Bestätigung durch den Benutzer wechselt der Status zu 'Bestätigt'. Durch die "
-"Auftragsbestätigung des Lieferanten wechselt der Status zu 'Angenommen' . "
-"Wenn der Einkaufsauftrag bezahlt ist und die Ware empfangen wurde, wechselt "
-"der Status auf 'Erledigt' (Done). Falls ein Abbruch auftritt bei der "
-"Rechnungserfassung oder bei der Wareneingangserfassung wechselt der Status "
-"auf 'Fehler' (Sonderfall / Exception)."
+"eine Bestellung im Status 'Entwurf'. Bei Bestätigung durch den Benutzer "
+"wechselt der Status zu 'Bestätigt'. Durch die Auftragsbestätigung des "
+"Lieferanten wechselt der Status zu 'Angenommen' . Wenn der Einkaufsauftrag "
+"bezahlt ist und die Ware empfangen wurde, wechselt der Status auf 'Erledigt' "
+". Falls ein Abbruch bei der Rechnungserfassung oder bei der "
+"Wareneingangserfassung erfolgt, wechselt der Status auf 'Fehler' ."
#. module: purchase
#: help:purchase.order,amount_tax:0
@@ -2348,7 +2366,7 @@ msgid "The total amount"
msgstr "Gesamt Betrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr "Es ist noch kein Lieferanten für das Produkt %s angelegt"
@@ -2415,13 +2433,13 @@ msgid "Total amount"
msgstr "Gesamtbetrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr "Es ist nicht möglich die Bestellung %s abzubrechen."
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Es ist nicht möglich diese Bestellung abzubrechen."
@@ -2442,6 +2460,11 @@ msgid "Unit Price"
msgstr "Preis pro Einheit"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr "Anzahl Mengeneinheit"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Einheiten Kategorien"
@@ -2471,8 +2494,7 @@ msgstr "Nettobetrag"
#: field:purchase.config.settings,group_costing_method:0
msgid "Use 'Real Price' or 'Average' costing methods."
msgstr ""
-"Verwende 'Einkaufspreis' oder 'Durchschnittspreis' als Kalkulationsverfahren "
-"zur Bestandsbewertung"
+"Benutzen Sie 'Einkaufs-' oder 'Durchschnittspreis' zur Bestandsbewertung"
#. module: purchase
#: field:account.config.settings,module_purchase_analytic_plans:0
@@ -2507,7 +2529,6 @@ msgstr "Genehmigt von"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Geprüft durch"
@@ -2523,15 +2544,14 @@ msgstr "Erwarte Auftragsbestätigung"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Lager"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2540,7 +2560,7 @@ msgstr "Warnung!"
#. module: purchase
#: field:purchase.order,website_message_ids:0
msgid "Website Messages"
-msgstr "Website Nachrichten"
+msgstr "Webseite Nachrichten"
#. module: purchase
#: help:purchase.order,website_message_ids:0
@@ -2562,7 +2582,13 @@ msgstr ""
"Sie können keine Bestellung ohne erfasste Bestellpositionen bestätigen."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr "Sie haben bereits Produktlieferungen erhalten. "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2572,3 +2598,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Ihre Referenz"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referenz ME"
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 806e96ef7ae..e87fdd61927 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Ακυρωμένη"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Περιγραφή"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Προορισμός"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Φορολογική Θέση"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Καθαρή Τιμή"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr "Γραμμές Παραγγελίας"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Προϊόν"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Τιμοκατάλογος Αγορών"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Ποσ."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Ποσότητα"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Παραπομπή"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Παραστατικά προμηθευτών"
@@ -1948,7 +1955,7 @@ msgstr ""
"προϊόντα/ποσότητες."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1956,7 +1963,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1964,7 +1971,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1992,7 +1999,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2059,13 +2066,13 @@ msgid "Total amount"
msgstr "Σύνολικό ποσό"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2084,6 +2091,11 @@ msgid "Unit Price"
msgstr "Τιμή Μονάδας"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2147,7 +2159,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Επικυρωμένο από"
@@ -2163,15 +2174,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Αποθήκη"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2199,7 +2209,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 888d036af34..01d39c8ef45 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# of Lines"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# of Lines"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Average Price"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Cancelled"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Category"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Configuration"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destination"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscal Position"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Net Price"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Order Date"
@@ -1279,6 +1287,7 @@ msgstr "Order Lines"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Products by Category"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1576,7 +1589,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1626,12 +1639,11 @@ msgstr "Qty"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantity"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1670,7 +1682,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1723,11 +1735,6 @@ msgid "Reference"
msgstr "Reference"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Reference UOM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1811,7 +1818,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1900,7 +1907,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1908,7 +1915,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Supplier Invoices"
@@ -1950,7 +1957,7 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1958,7 +1965,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1966,7 +1973,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "The selected supplier only sells this product by %s"
@@ -1994,7 +2001,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2061,13 +2068,13 @@ msgid "Total amount"
msgstr "Total amount"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2086,6 +2093,11 @@ msgid "Unit Price"
msgstr "Unit Price"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2149,7 +2161,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validated by"
@@ -2165,15 +2176,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Warehouse"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2201,7 +2211,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "You must first cancel all invoices related to this purchase order."
@@ -2210,3 +2226,6 @@ msgstr "You must first cancel all invoices related to this purchase order."
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr ""
+
+#~ msgid "Reference UOM"
+#~ msgstr "Reference UOM"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 1fa2bc6883f..b24530fcfbd 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,93 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-24 18:15+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-10-01 00:52+0000\n"
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish <es@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: 2014-08-25 10:06+0000\n"
-"X-Generator: Launchpad (build 17163)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-"\n"
-"Crea la ruta de dropshipping y añade tests más complejos\n"
-"- Esto instala el módulo stock_dropshipping."
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * El estado 'Borrador' se establece automáticamente cuando se crea el "
-"pedido de compra.\n"
-"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
-"compra.\n"
-"* El estado 'Realizado' se establece automáticamente cuando el pedido de "
-"compra se realiza.\n"
-"* El estado 'Cancelado' se establece cuando el usuario cancela el pedido de "
-"compra."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Comprar"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "Nº compras"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "Nº facturas proveedor"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Nº de pedido de compra"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name|safe} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(actualizar)"
+"X-Launchpad-Export-Date: 2014-10-02 06:43+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -104,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -138,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -170,38 +97,39 @@ msgid ""
"</div>\n"
" "
msgstr ""
+"\n"
"<div style=\"font-family: 'Lucida 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 una ${object.state in ('draft', 'sent') and 'solicitud de "
+" <p>Ésta es una ${object.state in ('draft', 'sent') and 'solicitud de "
"presupuesto' or '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"
-"   <strong>REFERENCIAS</strong><br>\n"
-"   Nº pedido: <strong>${object.name}</strong><br>\n"
-"   Total del pedido: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Fecha del pedido: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Referencia del pedido: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Su referencia: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Su contacto: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Pedido ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Su contacto: <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>Si tiene alguna cuestión, no dude en contactarnos.</p>\n"
+" <br/>\n"
+" <p>Si tiene alguna duda, no dude en contactarnos.</p>\n"
" <p>¡Gracias!</p>\n"
-" <br>\n"
-" <br>\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"
@@ -214,30 +142,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Teléfono:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -249,6 +177,7 @@ 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"
@@ -259,26 +188,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -291,30 +220,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -323,38 +252,39 @@ msgid ""
"</div>\n"
" "
msgstr ""
+"\n"
"<div style=\"font-family: 'Lucida 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 una ${object.state in ('draft', 'sent') and 'solicitud de "
+" <p>Ésta es una ${object.state in ('draft', 'sent') and 'solicitud de "
"presupuesto' or '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"
-"   <strong>REFERENCIAS</strong><br>\n"
-"   Nº solicitud: <strong>${object.name}</strong><br>\n"
-"   Total de la solicitud: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Fecha de la solicitud: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Referencia de la solicitud: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Su referencia: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Su contacto: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Pedido ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Su contacto: <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>Si tiene alguna cuestión, no dude en contactarnos.</p>\n"
+" <br/>\n"
+" <p>Si tiene alguna duda, no dude en contactarnos.</p>\n"
" <p>¡Gracias!</p>\n"
-" <br>\n"
-" <br>\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"
@@ -367,30 +297,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Teléfono:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -400,6 +330,80 @@ msgstr ""
" "
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+"\n"
+"Crea la ruta de dropshipping y añade tests más complejos\n"
+"- Esto instala el módulo stock_dropshipping."
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando se crea el "
+"pedido de compra.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"compra.\n"
+"* El estado 'Realizado' se establece automáticamente cuando el pedido de "
+"compra se realiza.\n"
+"* El estado 'Cancelado' se establece cuando el usuario cancela el pedido de "
+"compra."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Comprar"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "Nº compras"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "Nº facturas proveedor"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Nº de pedido de compra"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name|safe} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(actualizar)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -745,6 +749,11 @@ msgid "Associated procurements"
msgstr "Abastecimientos asociados"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr "Plazo medio de entrega"
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Precio medio"
@@ -809,8 +818,8 @@ msgid "Bid Valid Until"
msgstr "Licitación válida hasta"
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "Comprar"
@@ -842,7 +851,7 @@ msgid "Can be Purchased"
msgstr "Puede ser comprado"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr "No se puede encontrar ninguna ruta 'Comprar' genérica."
@@ -863,19 +872,23 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
"No se puede eliminar una línea de pedido de venta que esté en estado '%s'."
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr "Categoría del producto"
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr "Escoger entre varios licitantes en la licitación"
@@ -905,7 +918,7 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "¡Error de configuración!"
@@ -1069,7 +1082,6 @@ msgstr "Descripción"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -1106,7 +1118,7 @@ msgid "Draft PO"
msgstr "OC en borrador"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Pedido de compra en borrador creado"
@@ -1132,7 +1144,7 @@ msgstr "Asistente de redacción de correo electrónico."
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "¡Error!"
@@ -1162,13 +1174,6 @@ msgid "Extended Filters"
msgstr "Filtro avanzado"
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-"Cancele primero todas las recepciones relativas a este pedido de compra."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -1280,7 +1285,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "¡Acción no válida!"
@@ -1317,13 +1322,13 @@ msgid "Invoice Received"
msgstr "Factura recibida"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "Factura pagada"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr "Factura recibida"
@@ -1486,6 +1491,11 @@ msgid "Messages and communication history"
msgstr "Mensajes e historial de comunicación"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr "Compras mensuales"
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Precio neto"
@@ -1496,19 +1506,19 @@ msgid "New Mail"
msgstr "Nuevo correo"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "No se ha definido una dirección para el proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "No hay definido ningún proveedor por defecto para este producto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "¡No se ha definido un proveedor para este producto!"
@@ -1551,7 +1561,6 @@ msgstr "Abrir menú 'Compras'"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Fecha pedido"
@@ -1568,6 +1577,7 @@ msgstr "Líneas del pedido"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "Mes del pedido"
@@ -1609,7 +1619,7 @@ msgid "Outgoing Mails"
msgstr "Correos salientes"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PC: %s"
@@ -1683,6 +1693,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Pre-generar facturas borrador basadas en los pedidos de compra"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr "Precio por proveedor"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipos de precio"
@@ -1725,7 +1740,6 @@ msgstr "Regla de abastecimiento"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producto"
@@ -1765,7 +1779,7 @@ msgid "Products by Category"
msgstr "Productos por categoría"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr "Productos recibidos"
@@ -1878,7 +1892,7 @@ msgid "Purchase Pricelist"
msgstr "Tarifa de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr "Línea de compra creada y enlazada a un pedido de compra existente"
@@ -1931,12 +1945,11 @@ msgstr "Ctdad"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr "Cantidad añadidad en la línea de pedido de compra existente"
@@ -1975,7 +1988,7 @@ msgstr "SdP realizada"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "SdP creada"
@@ -2028,11 +2041,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referencia UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Unidad de medida de referencia"
@@ -2121,7 +2129,7 @@ msgid "Select an Open Sales Order"
msgstr "Seleccione un pedido de venta abierto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -2214,7 +2222,7 @@ msgid "Supplier Features"
msgstr "Características del proveedor"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr "Factura de proveedor"
@@ -2222,7 +2230,7 @@ msgstr "Factura de proveedor"
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Facturas de proveedor"
@@ -2264,7 +2272,7 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2274,7 +2282,7 @@ msgstr ""
"que debe ser un error de configuración!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2284,7 +2292,7 @@ msgstr ""
"lo que no debería comprarle menos."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -2322,7 +2330,7 @@ msgid "The total amount"
msgstr "El importe total."
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr "No hay proveedor asociado al producto %s"
@@ -2391,13 +2399,13 @@ msgid "Total amount"
msgstr "Importe total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr "No se puede cancelar el pedido de compra %s."
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "No se ha podido cancelar este pedido de compra."
@@ -2418,6 +2426,11 @@ msgid "Unit Price"
msgstr "Precio unidad"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr "Cantidad de la unidad"
+
+#. 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"
@@ -2481,7 +2494,6 @@ msgstr "Validado por:"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada por"
@@ -2497,15 +2509,14 @@ msgstr "Esperando aceptación proveedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2533,7 +2544,13 @@ 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
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr "Usted ya ha recibido algunas mercancías. "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2544,3 +2561,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Su referencia"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referencia UdM"
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 91ac894819f..a5981b41a20 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Argentina) <es_AR@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Líneas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Orden (Ref ${object.name o 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Líneas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Orden (Ref ${object.name o 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -486,6 +488,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Precio Promedio"
@@ -543,8 +550,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -572,7 +579,7 @@ msgid "Can be Purchased"
msgstr "Puede ser Comprado"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -593,18 +600,22 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -634,7 +645,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "¡Error de Configuración!"
@@ -796,7 +807,6 @@ msgstr "Descripción"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -831,7 +841,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -857,7 +867,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -887,12 +897,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -999,7 +1003,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1036,13 +1040,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1202,6 +1206,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Precio neto"
@@ -1212,19 +1221,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "¡No se ha definido un proveedor para este producto!"
@@ -1267,7 +1276,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1284,6 +1292,7 @@ msgstr "Líneas de la orden"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1325,7 +1334,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1389,6 +1398,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1431,7 +1445,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producto"
@@ -1471,7 +1484,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1578,7 +1591,7 @@ msgid "Purchase Pricelist"
msgstr "Lista de precios de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1631,12 +1644,11 @@ msgstr "Ctdad"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1675,7 +1687,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1728,11 +1740,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1816,7 +1823,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1905,7 +1912,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1913,7 +1920,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1956,7 +1963,7 @@ msgstr ""
"seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1966,7 +1973,7 @@ msgstr ""
"que debe ser un error de configuración!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1974,7 +1981,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -2002,7 +2009,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2069,13 +2076,13 @@ msgid "Total amount"
msgstr "Importe total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2094,6 +2101,11 @@ msgid "Unit Price"
msgstr "Precio unitario"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2157,7 +2169,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada por"
@@ -2173,15 +2184,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2209,7 +2219,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/es_BO.po b/addons/purchase/i18n/es_BO.po
index f4c1572564c..fd127565af4 100644
--- a/addons/purchase/i18n/es_BO.po
+++ b/addons/purchase/i18n/es_BO.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Bolivia) <es_BO@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index fa0e0d6439b..e8a71a4a484 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Chile) <es_CL@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Precio medio"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Descripción"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Precio neto"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Fecha pedido"
@@ -1279,6 +1287,7 @@ msgstr "Líneas del pedido"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producto"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Productos por categoría"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Tarifa de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Ctdad"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referecnia UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Facturas de proveedor"
@@ -1951,7 +1958,7 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1967,7 +1974,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1995,7 +2002,7 @@ msgid "The total amount"
msgstr "El importe total."
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2062,13 +2069,13 @@ msgid "Total amount"
msgstr "Importe total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2087,6 +2094,11 @@ msgid "Unit Price"
msgstr "Precio unidad"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2150,7 +2162,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada por"
@@ -2166,15 +2177,14 @@ msgstr "Esperando aceptación proveedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2202,7 +2212,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2211,3 +2227,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Su referencia"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referecnia UdM"
diff --git a/addons/purchase/i18n/es_CO.po b/addons/purchase/i18n/es_CO.po
index 8a3ac9c7873..db2f76bb5ba 100644
--- a/addons/purchase/i18n/es_CO.po
+++ b/addons/purchase/i18n/es_CO.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Colombia) <es_CO@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Error de Configuración!"
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -997,7 +1001,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1034,13 +1038,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1200,6 +1204,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1210,19 +1219,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "No se ha definido un proveedor para este producto!"
@@ -1265,7 +1274,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1282,6 +1290,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1323,7 +1332,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1387,6 +1396,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1429,7 +1443,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1469,7 +1482,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1576,7 +1589,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1626,12 +1639,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1670,7 +1682,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1723,11 +1735,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1811,7 +1818,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1900,7 +1907,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1908,7 +1915,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1951,7 +1958,7 @@ msgstr ""
"seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1967,7 +1974,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1995,7 +2002,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2058,13 +2065,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2083,6 +2090,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2146,7 +2158,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2162,15 +2173,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2198,7 +2208,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 6dd4ea4f82c..9dd910abaf6 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Costa Rica) <es_CR@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Precio medio"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Descripción"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Precio neto"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Fecha pedido"
@@ -1279,6 +1287,7 @@ msgstr "Líneas del pedido"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producto"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Productos por categoría"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Tarifa de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Ctdad"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referencia UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Facturas de proveedor"
@@ -1951,7 +1958,7 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1969,7 +1976,7 @@ msgstr ""
"usted no debe comprar menos."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1997,7 +2004,7 @@ msgid "The total amount"
msgstr "El importe total."
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2064,13 +2071,13 @@ msgid "Total amount"
msgstr "Importe total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2089,6 +2096,11 @@ msgid "Unit Price"
msgstr "Precio unidad"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2152,7 +2164,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada por"
@@ -2168,15 +2179,14 @@ msgstr "Esperando aceptación proveedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2204,7 +2214,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2215,3 +2231,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Su referencia"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referencia UdM"
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index a9d40fec0d5..c86d9053cc3 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Precio promedio"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Descripción"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Precio neto"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Fecha del Pedido"
@@ -1279,6 +1287,7 @@ msgstr "Líneas de pedido"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Producto"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Productos por categoría"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Tarifa de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Ctdad"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referencia UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Facturas de Proveedor"
@@ -1951,7 +1958,7 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1969,7 +1976,7 @@ msgstr ""
"usted no puede comprar menos."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1997,7 +2004,7 @@ msgid "The total amount"
msgstr "El importe total."
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2064,13 +2071,13 @@ msgid "Total amount"
msgstr "Monto Total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2089,6 +2096,11 @@ msgid "Unit Price"
msgstr "Precio unidad"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2152,7 +2164,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validada por"
@@ -2168,15 +2179,14 @@ msgstr "Esperando aceptación del proveedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2204,7 +2214,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2215,3 +2231,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Su referencia"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referencia UdM"
diff --git a/addons/purchase/i18n/es_MX.po b/addons/purchase/i18n/es_MX.po
index 52dd59e1cec..26187314faa 100644
--- a/addons/purchase/i18n/es_MX.po
+++ b/addons/purchase/i18n/es_MX.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Mexico) <es_MX@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/es_PE.po b/addons/purchase/i18n/es_PE.po
index db458e49d05..f5a72b8f8f2 100644
--- a/addons/purchase/i18n/es_PE.po
+++ b/addons/purchase/i18n/es_PE.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Peru) <es_PE@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 170a39b1309..4a4b166611b 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Estonian <et@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(uuenda)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(uuenda)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr "On ostetav"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Tühistatud"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategooria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Seadistused"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Kirjeldus"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Sihtpunkt"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr "Ostukorralduse mustand"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Finantspositsioon"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr "Arve loodud"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Netohind"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Korralduse kuupäev"
@@ -1279,6 +1287,7 @@ msgstr "Korralduse read"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Toode"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Tooted kategooria järgi"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Ostuhinnakiri"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Kogus"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Kogus"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Viide"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Ostuarved"
@@ -1947,7 +1954,7 @@ msgstr ""
"arvutab see tarnija hinna valitud toodetele/kogustele."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2058,13 +2065,13 @@ msgid "Total amount"
msgstr "Kogusumma"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2083,6 +2090,11 @@ msgid "Unit Price"
msgstr "Ühiku hind"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Mõõtühikute kategooriad"
@@ -2146,7 +2158,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Valideerija:"
@@ -2162,15 +2173,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Ladu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2198,7 +2208,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index bf3a8caf863..810c4a29173 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-09-15 15:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-09-27 09:15+0000\n"
"Last-Translator: Mikko Salmela <salmemik@gmail.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: 2014-09-16 08:35+0000\n"
+"X-Launchpad-Export-Date: 2014-09-28 07:21+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Tilaksi asetataan 'Ehdotus' automaattisesti, kun ostotilaus on ehdotus. "
-" \n"
-"* Tilaksi asetataan 'Vahvistettu' automaattisesti, kun ostotilaus on "
-"vahvistettu. \n"
-"* Tilaksi asetataan 'Valmis' automaattisesti, kun ostotilaus on valmis. "
-" \n"
-"* Tilaksi asetataan 'Peruutettu' automaattisesti, kun ostotilaus on "
-"peruutettu."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Rivien lukumäärä"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Ostotilauksen numero"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Tilaus (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(päivitä)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Tilaksi asetataan 'Ehdotus' automaattisesti, kun ostotilaus on ehdotus. "
+" \n"
+"* Tilaksi asetataan 'Vahvistettu' automaattisesti, kun ostotilaus on "
+"vahvistettu. \n"
+"* Tilaksi asetataan 'Valmis' automaattisesti, kun ostotilaus on valmis. "
+" \n"
+"* Tilaksi asetataan 'Peruutettu' automaattisesti, kun ostotilaus on "
+"peruutettu."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Rivien lukumäärä"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Ostotilauksen numero"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Tilaus (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(päivitä)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -524,6 +526,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Keskimääräinen hinta"
@@ -581,8 +588,8 @@ msgid "Bid Valid Until"
msgstr "Tarjous voimassa"
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -610,7 +617,7 @@ msgid "Can be Purchased"
msgstr "Voidaan ostaa"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -631,18 +638,22 @@ msgid "Cancelled"
msgstr "Peruttu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Ryhmä"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -672,7 +683,7 @@ msgid "Configuration"
msgstr "Määritykset"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Konfiguraatiovirhe!"
@@ -834,7 +845,6 @@ msgstr "Kuvaus"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Kohde"
@@ -869,7 +879,7 @@ msgid "Draft PO"
msgstr "Ostoehdotus"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ostoehdotus on luotu"
@@ -895,7 +905,7 @@ msgstr "Sähköpostin automaattinen koostaminen"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Virhe!"
@@ -925,12 +935,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Verokanta"
@@ -1036,7 +1040,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Virheellinen toiminto!"
@@ -1073,13 +1077,13 @@ msgid "Invoice Received"
msgstr "Lasku vastaanotettu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1242,6 +1246,11 @@ msgid "Messages and communication history"
msgstr "Viesti- ja kommunikointihistoria"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Nettohinta"
@@ -1252,19 +1261,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Toimittajan osoitetta ei ole määritetty"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Tuotteelle ei ole määritelty oletustoimittajaa"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Tuotteelle ei ole määritelty toimittajaa!"
@@ -1307,7 +1316,6 @@ msgstr "Avaa ostovalikko"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Tilauspäivä"
@@ -1324,6 +1332,7 @@ msgstr "Tilausrivit"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1365,7 +1374,7 @@ msgid "Outgoing Mails"
msgstr "Lähtevät sähköpostit"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "OT: %s"
@@ -1429,6 +1438,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Alustavat laskuehdotukset perustuen ostotilauksiin"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Hintatyypit"
@@ -1471,7 +1485,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Tuote"
@@ -1511,7 +1524,7 @@ msgid "Products by Category"
msgstr "Tuotteet ryhmittäin"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1622,7 +1635,7 @@ msgid "Purchase Pricelist"
msgstr "Ostohinnasto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1674,12 +1687,11 @@ msgstr "Määrä"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Määrä"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1718,7 +1730,7 @@ msgstr "Tarjouspyyntö valmis"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "Tarjouspyyntö luotu"
@@ -1771,11 +1783,6 @@ msgid "Reference"
msgstr "Viite"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referenssiyksikkö"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referenssiyksikkö"
@@ -1861,7 +1868,7 @@ msgid "Select an Open Sales Order"
msgstr "Valitse avoin myyntitilaus"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1950,7 +1957,7 @@ msgid "Supplier Features"
msgstr "Toimittajan ominaisuudet"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1958,7 +1965,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Toimittajan laskut"
@@ -2000,7 +2007,7 @@ msgstr ""
"hinnan valituille tuoteille/määrille."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2010,7 +2017,7 @@ msgstr ""
"konfigurointivirhe!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2020,7 +2027,7 @@ msgstr ""
"tilata vähempää"
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -2048,7 +2055,7 @@ msgid "The total amount"
msgstr "Kokonaismäärä"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2115,13 +2122,13 @@ msgid "Total amount"
msgstr "Yhteensä"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Tätä ostotilausta ei voi perua."
@@ -2142,6 +2149,11 @@ msgid "Unit Price"
msgstr "Yksikköhinta"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Yksiköiden ryhmät"
@@ -2170,7 +2182,7 @@ msgstr "Veroton summa"
#. module: purchase
#: field:purchase.config.settings,group_costing_method:0
msgid "Use 'Real Price' or 'Average' costing methods."
-msgstr ""
+msgstr "Käytä 'Todellinen Hinta' tai 'Keskihinta' laskentamenetelmiä."
#. module: purchase
#: field:account.config.settings,module_purchase_analytic_plans:0
@@ -2205,7 +2217,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Vahvistaja"
@@ -2221,15 +2232,14 @@ msgstr "Odottaa toimittajan vahvistusta"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Varasto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2257,7 +2267,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Ostotilauksella pitää olla rivejä, jotta sen voi vahvistaa."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2268,3 +2284,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Tilausviitteesi"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referenssiyksikkö"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index ed40ee679e7..282c0d6d372 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: French <fr@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * L'état 'Brouillon' est défini automatiquement quand un bon de commande "
-"est en brouillon.\n"
-"* L'état 'Confirmée' est défini automatiquement quand un bon de commande est "
-"confirmé.\n"
-"* L'état 'Terminée' est défini automatiquement quand le bon de commande est "
-"terminé.\n"
-"* L'état 'Annulée' est défini automatiquement quand un utilisateur annule le "
-"bon de commande."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nb. de lignes"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Nb. de commandes d'achat"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(mise à jour)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * L'état 'Brouillon' est défini automatiquement quand un bon de commande "
+"est en brouillon.\n"
+"* L'état 'Confirmée' est défini automatiquement quand un bon de commande est "
+"confirmé.\n"
+"* L'état 'Terminée' est défini automatiquement quand le bon de commande est "
+"terminé.\n"
+"* L'état 'Annulée' est défini automatiquement quand un utilisateur annule le "
+"bon de commande."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nb. de lignes"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Nb. de commandes d'achat"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(mise à jour)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -529,6 +531,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Prix moyen"
@@ -586,8 +593,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -615,7 +622,7 @@ msgid "Can be Purchased"
msgstr "Peut être acheté"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -636,18 +643,22 @@ msgid "Cancelled"
msgstr "Annulé"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Catégorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -677,7 +688,7 @@ msgid "Configuration"
msgstr "Configuration"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Erreur de paramétrage !"
@@ -840,7 +851,6 @@ msgstr "Description"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destination"
@@ -875,7 +885,7 @@ msgid "Draft PO"
msgstr "Bon de commande brouillon"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Bon de commande brouillon créé"
@@ -901,7 +911,7 @@ msgstr "Assistant de composition de courriel"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Erreur !"
@@ -931,12 +941,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Position Fiscale"
@@ -1042,7 +1046,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Action invalide !"
@@ -1079,13 +1083,13 @@ msgid "Invoice Received"
msgstr "Facture reçue"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1245,6 +1249,11 @@ msgid "Messages and communication history"
msgstr "Historique des messages et des communications"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Prix net"
@@ -1255,19 +1264,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Aucune adresse définie pour le fournisseur"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Pas de fournisseur par défaut défini pour cet article"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Aucun fournisseur défini pour cet article !"
@@ -1310,7 +1319,6 @@ msgstr "Ouvrir le menu des achats"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Date de commande"
@@ -1327,6 +1335,7 @@ msgstr "Lignes de commande"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1368,7 +1377,7 @@ msgid "Outgoing Mails"
msgstr "Courriels à envoyer"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1434,6 +1443,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Une facture brouillon sera générée sur base du bon de commande"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Types de prix"
@@ -1476,7 +1490,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Article"
@@ -1516,7 +1529,7 @@ msgid "Products by Category"
msgstr "Articles par catégorie"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1627,7 +1640,7 @@ msgid "Purchase Pricelist"
msgstr "Liste de prix d'achat"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1680,12 +1693,11 @@ msgstr "Qté"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantité"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1724,7 +1736,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1777,11 +1789,6 @@ msgid "Reference"
msgstr "Référence"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "UdM de référence"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Unité de mesure de réference"
@@ -1867,7 +1874,7 @@ msgid "Select an Open Sales Order"
msgstr "Sélectionnez un bon de commande ouvert."
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1959,7 +1966,7 @@ msgid "Supplier Features"
msgstr "Fonctionnalités fournisseur"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1967,7 +1974,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Factures fournisseur"
@@ -2010,7 +2017,7 @@ msgstr ""
"sélectionnés."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2020,7 +2027,7 @@ msgstr ""
"qui semble être une erreur de paramétrage !"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2030,7 +2037,7 @@ msgstr ""
"pas en commander moins."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Le fournisseur sélectionné peut seulement vendre cet article par %s"
@@ -2058,7 +2065,7 @@ msgid "The total amount"
msgstr "Montant total"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2125,13 +2132,13 @@ msgid "Total amount"
msgstr "Montant total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Impossible d'annuler ce bon de commande"
@@ -2152,6 +2159,11 @@ msgid "Unit Price"
msgstr "Prix unitaire"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Catégories d'unités de mesure"
@@ -2215,7 +2227,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validé par"
@@ -2231,15 +2242,14 @@ msgstr "En attente de confirmation du fournisseur"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Entrepôt"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2267,7 +2277,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Vous ne pouvez pas confirmer une commande d'achat sans aucune ligne."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2277,3 +2293,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Votre Référence Commande"
+
+#~ msgid "Reference UOM"
+#~ msgstr "UdM de référence"
diff --git a/addons/purchase/i18n/fr_CA.po b/addons/purchase/i18n/fr_CA.po
index 8a28f34562f..454e3b54227 100644
--- a/addons/purchase/i18n/fr_CA.po
+++ b/addons/purchase/i18n/fr_CA.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-27 20:27+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: French (Canada) <fr_CA@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: 2014-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 17174)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index a9b6d56999c..ec391ea0be9 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 4af556c4ec4..63069e88a8f 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -7,89 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Croatian <hr@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * 'Nacrt' status je automatski status kada je nalog za nabavu u statusu "
-"pripreme. \n"
-"* 'Potvrđeno' je status koji se dobiva nakon potvrđivanja naloga za nabavu. "
-" \n"
-"* 'Završeno' je status kada je nalog za nabavu završen. "
-" \n"
-"* 'Otkazano' je status kada korisnik otkaže nalog za nabavu."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# linija"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# Naloga za nabavu"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Narudžba (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(ažuriraj)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -100,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -134,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -170,6 +101,7 @@ 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"
@@ -180,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -212,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -246,6 +178,76 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * 'Nacrt' status je automatski status kada je nalog za nabavu u statusu "
+"pripreme. \n"
+"* 'Potvrđeno' je status koji se dobiva nakon potvrđivanja naloga za nabavu. "
+" \n"
+"* 'Završeno' je status kada je nalog za nabavu završen. "
+" \n"
+"* 'Otkazano' je status kada korisnik otkaže nalog za nabavu."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# linija"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Naloga za nabavu"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Narudžba (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(ažuriraj)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -527,6 +529,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Prosječna cijena"
@@ -584,8 +591,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -613,7 +620,7 @@ msgid "Can be Purchased"
msgstr "Vidljiv u nabavi"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -634,18 +641,22 @@ msgid "Cancelled"
msgstr "Otkazani"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Grupa"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -675,7 +686,7 @@ msgid "Configuration"
msgstr "Postava"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Greška u konfiguraciji!"
@@ -837,7 +848,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Odredište"
@@ -872,7 +882,7 @@ msgid "Draft PO"
msgstr "Nacrt naloga za nabavu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Nacrt naloga za nabavu kreiran"
@@ -898,7 +908,7 @@ msgstr "Čarobnjak za sastavljanje e-pošte"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Greška!"
@@ -928,12 +938,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -1039,7 +1043,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Neispravna akcija!"
@@ -1076,13 +1080,13 @@ msgid "Invoice Received"
msgstr "Račun primljen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1242,6 +1246,11 @@ msgid "Messages and communication history"
msgstr "Poruke i povijest"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Iznos"
@@ -1252,19 +1261,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nema upisane adrese dobavljača"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Za ovaj proizvod nema definiranog dobavljača"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Za ovaj proizvod neije definiran dobavljač"
@@ -1307,7 +1316,6 @@ msgstr "Otvori izbornik Nabave"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Datum naloga"
@@ -1324,6 +1332,7 @@ msgstr "Stavke naloga"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1365,7 +1374,7 @@ msgid "Outgoing Mails"
msgstr "Odlazni mailovi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "NN: %s"
@@ -1429,6 +1438,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Pred-generirani nacrti računa bazirani na nalozima za nabavu"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipovi cijena"
@@ -1471,7 +1485,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Proizvod"
@@ -1511,7 +1524,7 @@ msgid "Products by Category"
msgstr "Proizvodi po kategorijama"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1621,7 +1634,7 @@ msgid "Purchase Pricelist"
msgstr "Cjenik nabave"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1673,12 +1686,11 @@ msgstr "Kol."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1717,7 +1729,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1770,11 +1782,6 @@ msgid "Reference"
msgstr "Vezna oznaka"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referentna JM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referentna JM"
@@ -1860,7 +1867,7 @@ msgid "Select an Open Sales Order"
msgstr "Odaberite otvoreni Prodajni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1951,7 +1958,7 @@ msgid "Supplier Features"
msgstr "Značajke dobavljača"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1959,7 +1966,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Ulazni računi"
@@ -2001,7 +2008,7 @@ msgstr ""
"odabrane proizvode/količine."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2011,7 +2018,7 @@ msgstr ""
"izgleda kao pogrešna postavka!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2021,7 +2028,7 @@ msgstr ""
"naručivati manje."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Odabrani dobavljač prodaje ovaj proizvod jedino po %s"
@@ -2049,7 +2056,7 @@ msgid "The total amount"
msgstr "Ukupan iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2116,13 +2123,13 @@ msgid "Total amount"
msgstr "Ukupni iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Nije moguće otkazati nalog za nabavu."
@@ -2143,6 +2150,11 @@ msgid "Unit Price"
msgstr "Jedinična cijena"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Kategorije JM"
@@ -2206,7 +2218,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Potvrdio"
@@ -2222,15 +2233,14 @@ msgstr "Čeka potvrdu dobavljača"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2258,7 +2268,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Nije moguće potvrditi nalog za nabavu bez ijedne stavke."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2267,3 +2283,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Referenca naloga"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referentna JM"
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 870ebb90306..35788657e52 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -7,91 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Hungarian <hu@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * A 'Tervezet' állapot automatikusan beállított, ha a beszerzési "
-"megrendelés tervezet állapotú. \n"
-"* A 'Visszaigazolt' állapot automatikusan beállított visszaigzolásként, hogy "
-"a beszerzési megrendelés visszaigozl állapotú. "
-" \n"
-"* Az 'Elvégzett' állapot automatikusan beállított, ha a beszerzési "
-"megrendelés elvégzettre állított. \n"
-"* A 'Visszavont' állapot automatikusan beállított, ha egy felhasználó "
-"visszavonta azt."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Sorok száma"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# Beszerzési megrendelésből"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Megrendelés (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(Frissítés)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -102,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -136,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -172,6 +101,7 @@ 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"
@@ -182,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -214,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -248,6 +178,78 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * A 'Tervezet' állapot automatikusan beállított, ha a beszerzési "
+"megrendelés tervezet állapotú. \n"
+"* A 'Visszaigazolt' állapot automatikusan beállított visszaigzolásként, hogy "
+"a beszerzési megrendelés visszaigozl állapotú. "
+" \n"
+"* Az 'Elvégzett' állapot automatikusan beállított, ha a beszerzési "
+"megrendelés elvégzettre állított. \n"
+"* A 'Visszavont' állapot automatikusan beállított, ha egy felhasználó "
+"visszavonta azt."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Sorok száma"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Beszerzési megrendelésből"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Megrendelés (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(Frissítés)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -526,6 +528,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Átlagár"
@@ -583,8 +590,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -612,7 +619,7 @@ msgid "Can be Purchased"
msgstr "Beszerezhető"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -633,18 +640,22 @@ msgid "Cancelled"
msgstr "Visszavont"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategória"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -674,7 +685,7 @@ msgid "Configuration"
msgstr "Beállítás"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Beállítási hiba!"
@@ -836,7 +847,6 @@ msgstr "Leírás"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Célállomás"
@@ -871,7 +881,7 @@ msgid "Draft PO"
msgstr "Tervezet beszerzési megrendelés"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Beszerzési megrendelés tervezet létrehozva"
@@ -897,7 +907,7 @@ msgstr "Email összeállító varázsló"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Hiba!"
@@ -927,12 +937,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "ÁFA pozíció"
@@ -1038,7 +1042,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Érvénytelen lépés!"
@@ -1075,13 +1079,13 @@ msgid "Invoice Received"
msgstr "Beérkezett számla"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1244,6 +1248,11 @@ msgid "Messages and communication history"
msgstr "Üzenetek és kommunikációs történet"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Nettó ár"
@@ -1254,19 +1263,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nincs cím megadva a szállítóhoz"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Nincs alapértelmezett beszállító meghatározva ehhez a termékhez"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nincs szállító meghatározva ehhez a termékhez !"
@@ -1309,7 +1318,6 @@ msgstr "Beszerzési menű megnyitása"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Megrendelés dátuma"
@@ -1326,6 +1334,7 @@ msgstr "Megrendelés sorok"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1367,7 +1376,7 @@ msgid "Outgoing Mails"
msgstr "Kimenő levelek"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "Beszerzési megrendelés: %s"
@@ -1432,6 +1441,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Előre generált tervezet számla a beszerzési megrendelés alapján"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Ártípusok"
@@ -1474,7 +1488,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Termék"
@@ -1514,7 +1527,7 @@ msgid "Products by Category"
msgstr "Termékek kategóriánként"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1625,7 +1638,7 @@ msgid "Purchase Pricelist"
msgstr "Beszerzési árlista"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1678,12 +1691,11 @@ msgstr "Mennyiség"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Mennyiség"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1722,7 +1734,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1775,11 +1787,6 @@ msgid "Reference"
msgstr "Hivatkozás"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Hivatkozási ME"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referencia mértékegység"
@@ -1865,7 +1872,7 @@ msgid "Select an Open Sales Order"
msgstr "Válasszon egy nyitott vevői megrendelést"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1957,7 +1964,7 @@ msgid "Supplier Features"
msgstr "Beszállító tulajdonságai"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1965,7 +1972,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Bejövő számlák"
@@ -2008,7 +2015,7 @@ msgstr ""
"árát."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2018,7 +2025,7 @@ msgstr ""
"beállítási hibának tűnik!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2028,7 +2035,7 @@ msgstr ""
"ne vásároljon ennél kevesebbet."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, 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"
@@ -2056,7 +2063,7 @@ msgid "The total amount"
msgstr "A végösszeg"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2123,13 +2130,13 @@ msgid "Total amount"
msgstr "Teljes összeg"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Nem lehet visszavonni ezt a beszerzési megrendelést."
@@ -2150,6 +2157,11 @@ msgid "Unit Price"
msgstr "Egységár"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Mértékegység kategóriák"
@@ -2213,7 +2225,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Jóváhagyó"
@@ -2229,15 +2240,14 @@ msgstr "Szállító visszaigazolására várakozik"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Raktár"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2267,7 +2277,13 @@ msgstr ""
"tételei."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2276,3 +2292,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Szállítói megrendelés hivatkozása"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Hivatkozási ME"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 99be3cfec63..834ba005ddf 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Harga Rata-rata"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Dibatalkan"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Konfigurasi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Konfigurasi error !"
@@ -794,7 +805,6 @@ msgstr "Keterangan"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Tujuan"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posisi Fiskal"
@@ -995,7 +999,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1032,13 +1036,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1198,6 +1202,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Harga Bersih"
@@ -1208,19 +1217,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Supplier belum didefinisikan untuk produk ini"
@@ -1263,7 +1272,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Tanggal Order"
@@ -1280,6 +1288,7 @@ msgstr "Daftar Order"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1321,7 +1330,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1385,6 +1394,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1427,7 +1441,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produk"
@@ -1467,7 +1480,7 @@ msgid "Products by Category"
msgstr "Produk berdasarkan kategori"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Daftar harga Pembelian"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Qty"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Kuantitas"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referensi"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referensi UoM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faktur Pemasok"
@@ -1949,7 +1956,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1957,7 +1964,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1965,7 +1972,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1993,7 +2000,7 @@ msgid "The total amount"
msgstr "Jumlah Total"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2058,13 +2065,13 @@ msgid "Total amount"
msgstr "Jumlah total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2083,6 +2090,11 @@ msgid "Unit Price"
msgstr "Harga Satuan"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2146,7 +2158,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Divalidasi oleh .."
@@ -2162,15 +2173,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Gudang"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2198,7 +2208,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2207,3 +2223,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Referensi Order Anda"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referensi UoM"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 73aadf3a348..53b2f9ba83a 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-10-02 14:41+0000\n"
+"Last-Translator: Simone Bernini <simone@aperturelabs.it>\n"
"Language-Team: Italian <it@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Lo stato 'Bozza' viene impostato automaticamente quando un ordine di "
-"acquisto si trova in stato bozza.\n"
-"* Lo stato 'Confermato' viene impostato automaticamente quando un ordine di "
-"acquisto si trova in stato confermato.\n"
-"* Lo stato 'Completato' viene impostato automaticamente quando un ordine di "
-"acquisto è impostato su completato.\n"
-"* Lo stato 'Annullato' viene impostato automaticamente quando un utente "
-"annulla un ordine di acquisto."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Numero di linee"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# dell'ordine di acquisto"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Ordine (Rif ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(aggiornamento)"
+"X-Launchpad-Export-Date: 2014-10-03 06:26+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Lo stato 'Bozza' viene impostato automaticamente quando un ordine di "
+"acquisto si trova in stato bozza.\n"
+"* Lo stato 'Confermato' viene impostato automaticamente quando un ordine di "
+"acquisto si trova in stato confermato.\n"
+"* Lo stato 'Completato' viene impostato automaticamente quando un ordine di "
+"acquisto è impostato su completato.\n"
+"* Lo stato 'Annullato' viene impostato automaticamente quando un utente "
+"annulla un ordine di acquisto."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Numero di linee"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# dell'ordine di acquisto"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Ordine (Rif ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(aggiornamento)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -536,6 +538,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Prezzo medio"
@@ -593,8 +600,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -622,7 +629,7 @@ msgid "Can be Purchased"
msgstr "Può essere acquistato"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -643,18 +650,22 @@ msgid "Cancelled"
msgstr "Annullato"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -684,7 +695,7 @@ msgid "Configuration"
msgstr "Configurazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Errore di configurazione!"
@@ -846,7 +857,6 @@ msgstr "Descrizione"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destinazione"
@@ -881,7 +891,7 @@ msgid "Draft PO"
msgstr "PO Bozza"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ordine di acquisto bozza creato"
@@ -907,7 +917,7 @@ msgstr "Wizard composizione email"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Errore!"
@@ -937,12 +947,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posizione Fiscale"
@@ -1049,7 +1053,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Azione non valida!"
@@ -1086,13 +1090,13 @@ msgid "Invoice Received"
msgstr "Fattura Ricevuta"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1252,6 +1256,11 @@ msgid "Messages and communication history"
msgstr "Storico messaggi e comunicazioni"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Prezzo Netto"
@@ -1262,19 +1271,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nessun indirizzo definito per il fornitore"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Nessun fornitore definito di default per questo prodotto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nessun fornitore definito per questo prodotto !"
@@ -1317,7 +1326,6 @@ msgstr "Apre Menù Acquisti"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data ordine"
@@ -1334,6 +1342,7 @@ msgstr "Righe Ordine"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1375,7 +1384,7 @@ msgid "Outgoing Mails"
msgstr "Email in uscita"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1440,6 +1449,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Pre-genera fatture bozza basate sugli ordini di acquisto"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipi di prezzo"
@@ -1454,7 +1468,7 @@ msgstr "Listino Prezzi"
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
#: model:ir.ui.menu,name:purchase.menu_purchase_pricelist_version_action
msgid "Pricelist Versions"
-msgstr "Versione listino prezzi"
+msgstr "Versioni listini prezzi"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
@@ -1482,7 +1496,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Prodotto"
@@ -1522,7 +1535,7 @@ msgid "Products by Category"
msgstr "Prodotti per Categoria"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1633,7 +1646,7 @@ msgid "Purchase Pricelist"
msgstr "Listino Prezzi d'Acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1686,12 +1699,11 @@ msgstr "Qta'"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantità"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1730,7 +1742,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1780,12 +1792,7 @@ msgstr ""
#: view:purchase.order:purchase.view_purchase_order_filter
#: view:purchase.order:purchase.view_request_for_quotation_filter
msgid "Reference"
-msgstr "Referenza"
-
-#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "UoM di riferimento"
+msgstr "Riferimento"
#. module: purchase
#: field:purchase.report,product_uom:0
@@ -1874,7 +1881,7 @@ msgid "Select an Open Sales Order"
msgstr "Selezionare un ordine di vendita aperto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1967,7 +1974,7 @@ msgid "Supplier Features"
msgstr "Caratteristiche Fornitore"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1975,7 +1982,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Fatture di acquisto"
@@ -2017,7 +2024,7 @@ msgstr ""
"il prezzo del fornitore per i prodotti e le quantità selezionate"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2025,7 +2032,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2035,7 +2042,7 @@ msgstr ""
"dovrebbe ordinare una quantità inferiore."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -2063,7 +2070,7 @@ msgid "The total amount"
msgstr "Il costo totale"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2130,13 +2137,13 @@ msgid "Total amount"
msgstr "Importo Totale"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Impossibile annullare questo ordine di acquisto."
@@ -2157,6 +2164,11 @@ msgid "Unit Price"
msgstr "Prezzo unitario"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Categorie Unità di Misura"
@@ -2175,7 +2187,7 @@ msgstr "Messaggi non letti"
#. module: purchase
#: view:purchase.order:purchase.purchase_order_tree
msgid "Untaxed"
-msgstr "Non tassato"
+msgstr "Imponibile"
#. module: purchase
#: field:purchase.order,amount_untaxed:0
@@ -2220,7 +2232,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Confermata da"
@@ -2236,15 +2247,14 @@ msgstr "In attesa della risposta del fornitore"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Magazzino"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2272,7 +2282,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Non è possibile confermare un ordine di acquisto senza righe."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2281,3 +2297,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Vostro riferimento ordine"
+
+#~ msgid "Reference UOM"
+#~ msgstr "UoM di riferimento"
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index b2940ad4c3a..74f40007c31 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "行数"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(更新)"
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "行数"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(更新)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -490,6 +492,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "平均価格"
@@ -547,8 +554,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -576,7 +583,7 @@ msgid "Can be Purchased"
msgstr "購買可能"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -597,18 +604,22 @@ msgid "Cancelled"
msgstr "キャンセル済"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "分類"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -638,7 +649,7 @@ msgid "Configuration"
msgstr "設定"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -800,7 +811,6 @@ msgstr "説明"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "配送先"
@@ -835,7 +845,7 @@ msgid "Draft PO"
msgstr "ドラフトPO"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -861,7 +871,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -891,12 +901,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "会計ポジション"
@@ -1000,7 +1004,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1037,13 +1041,13 @@ msgid "Invoice Received"
msgstr "請求書受領済"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1204,6 +1208,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "正価"
@@ -1214,19 +1223,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "この製品には仕入先が定義されていません。"
@@ -1269,7 +1278,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "発注日"
@@ -1286,6 +1294,7 @@ msgstr "オーダー行"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1327,7 +1336,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "発注オーダー:%s"
@@ -1391,6 +1400,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "発注書に基づいたドラフト請求書を事前に生成"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "価格タイプ"
@@ -1433,7 +1447,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "製品"
@@ -1473,7 +1486,7 @@ msgid "Products by Category"
msgstr "カテゴリ別製品"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1581,7 +1594,7 @@ msgid "Purchase Pricelist"
msgstr "購買価格リスト"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1631,12 +1644,11 @@ msgstr "数量"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1675,7 +1687,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1728,11 +1740,6 @@ msgid "Reference"
msgstr "参照"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "参照単位"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1816,7 +1823,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1905,7 +1912,7 @@ msgid "Supplier Features"
msgstr "仕入先の特徴"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1913,7 +1920,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "仕入先請求書"
@@ -1953,7 +1960,7 @@ msgid ""
msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1969,7 +1976,7 @@ msgid ""
msgstr "選択した仕入先の最小数量は %s %s に設定されています。それ未満の発注はできません。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "選択仕入先は%s によりこの製品のみを売ります。"
@@ -1997,7 +2004,7 @@ msgid "The total amount"
msgstr "合計金額"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2060,13 +2067,13 @@ msgid "Total amount"
msgstr "合計金額"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "この発注はキャンセルできません。"
@@ -2085,6 +2092,11 @@ msgid "Unit Price"
msgstr "単価"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2148,7 +2160,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "検証者"
@@ -2164,15 +2175,14 @@ msgstr "仕入先確認待ち"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "倉庫"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2200,7 +2210,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "最初に、この発注オーダーに関連する全請求書をキャンセルすべきです。"
@@ -2209,3 +2225,6 @@ msgstr "最初に、この発注オーダーに関連する全請求書をキャ
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "オーダー参照"
+
+#~ msgid "Reference UOM"
+#~ msgstr "参照単位"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index a35990b70e5..98b86385a89 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "취소됨"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "설명"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "목적지"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "회계 포지션"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "순 가격"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr "주문 라인"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "상품"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "구매 가격리스트"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "수량"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "수량"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "참조"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr "가격리스트는 이 구매 주문에 이용되는 통화를 설정하며, 선택된 상품/수량에 대해 공급자 가격을 계산합니다."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr "총계"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr "유닛 가격"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "검증한 이"
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "창고"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 064ff5ff000..40d4403b5d2 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Lithuanian <lt@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# eilučių"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(atnaujinti)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# eilučių"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(atnaujinti)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -514,6 +516,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Vidutinė suma"
@@ -571,8 +578,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -600,7 +607,7 @@ msgid "Can be Purchased"
msgstr "Galima nupirkti"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -621,18 +628,22 @@ msgid "Cancelled"
msgstr "Atšauktas"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorija"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -662,7 +673,7 @@ msgid "Configuration"
msgstr "Nustatymai"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Klaida nustatymuose!"
@@ -824,7 +835,6 @@ msgstr "Aprašymas"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Pristatymo vieta"
@@ -859,7 +869,7 @@ msgid "Draft PO"
msgstr "Juodraštis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -885,7 +895,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Klaida!"
@@ -915,12 +925,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Mokestinė aplinka"
@@ -1026,7 +1030,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Klaidingas veiksmas!"
@@ -1063,13 +1067,13 @@ msgid "Invoice Received"
msgstr "Gauta S/F"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1229,6 +1233,11 @@ msgid "Messages and communication history"
msgstr "Žinučių ir pranešimų istorija"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Galutinė kaina"
@@ -1239,19 +1248,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Šiam produktui nenustatytas tiekėjas!"
@@ -1294,7 +1303,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Užsakymo data"
@@ -1311,6 +1319,7 @@ msgstr "Užsakymo eilutės"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1352,7 +1361,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1416,6 +1425,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Kainos tipai"
@@ -1458,7 +1472,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produktas"
@@ -1498,7 +1511,7 @@ msgid "Products by Category"
msgstr "Produktai pagal kategorijas"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1605,7 +1618,7 @@ msgid "Purchase Pricelist"
msgstr "Pirkimų kainoraštis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1658,12 +1671,11 @@ msgstr "Kiekis"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Kiekis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1702,7 +1714,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1755,11 +1767,6 @@ msgid "Reference"
msgstr "Numeris"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Etaloninis matavimo vienetas"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Etaloninis matavimo vienetas"
@@ -1845,7 +1852,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1935,7 +1942,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1943,7 +1950,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Tiekėjo sąskaitos"
@@ -1985,7 +1992,7 @@ msgstr ""
"taip pat naudojamas apskaičiuoti perkamų produktų kainas."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1993,7 +2000,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2001,7 +2008,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -2029,7 +2036,7 @@ msgid "The total amount"
msgstr "Bendra suma su mokesčiais"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2095,13 +2102,13 @@ msgid "Total amount"
msgstr "Iš viso"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2121,6 +2128,11 @@ msgid "Unit Price"
msgstr "Kaina"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Matavimo vienetų kategorijos"
@@ -2184,7 +2196,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Patikrinta"
@@ -2200,15 +2211,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Sandėlis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2236,7 +2246,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2245,3 +2261,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Jūsų užsakymo numeris"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Etaloninis matavimo vienetas"
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index f0de8291aef..9212c5f15c2 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Rindu skaits"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Rindu skaits"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Vidējā Cena"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Atcelts"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorija"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Konfigurācija"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Apraksts"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Galamērķis"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Nodokļu Profils"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Neto Cena"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Pasūtījuma Datums"
@@ -1279,6 +1287,7 @@ msgstr "Pasūtījuma Rindas"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produkts"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Preces pa Kategorijām"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Iepirkumu Cenrādis"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Sk."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Skaits"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Artikuls (Kods)"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Atsauces Mērv."
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Piegādātāju Rēķini"
@@ -1947,7 +1954,7 @@ msgstr ""
"produktu/daudzumu un piegādes cenu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr "Izvēlētais piegādātājs ir uzstādījis %s %s kā minimālo daudzumu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, 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"
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr "Summa kopā"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2054,13 +2061,13 @@ msgid "Total amount"
msgstr "Summa kopā"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2079,6 +2086,11 @@ msgid "Unit Price"
msgstr "Vienības Cena"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2142,7 +2154,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Apstiprināja"
@@ -2158,15 +2169,14 @@ msgstr "Gaida Piegādātāja Apstiprinājumu"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Noliktava"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2194,7 +2204,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "Vispirms jāatceļ visi ar iepirkumu saistītie rēķini."
@@ -2203,3 +2219,6 @@ msgstr "Vispirms jāatceļ visi ar iepirkumu saistītie rēķini."
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Komentārs"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Atsauces Mērv."
diff --git a/addons/purchase/i18n/mk.po b/addons/purchase/i18n/mk.po
index 160b794c0f9..a4c411df413 100644
--- a/addons/purchase/i18n/mk.po
+++ b/addons/purchase/i18n/mk.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Macedonian <mk@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * 'Нацрт' статусот се сетира автоматски кога налогот за набавка е во "
-"статусот нацрт. \n"
-"* Статусот 'Потврдено' се сетира автоматски кога налогот за набавка ќе се "
-"потврди. \n"
-"* Статусот 'Завршено' се сетира автоматски кога налогот за набавка ќе се "
-"сетира како завршен. \n"
-"* Статусот 'Откажано' се сетира автоматски со откажување на налогот за "
-"набавка."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "бр. на ставки"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "бр. на налог за набавка"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Налог (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(ажурирај)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * 'Нацрт' статусот се сетира автоматски кога налогот за набавка е во "
+"статусот нацрт. \n"
+"* Статусот 'Потврдено' се сетира автоматски кога налогот за набавка ќе се "
+"потврди. \n"
+"* Статусот 'Завршено' се сетира автоматски кога налогот за набавка ќе се "
+"сетира како завршен. \n"
+"* Статусот 'Откажано' се сетира автоматски со откажување на налогот за "
+"набавка."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "бр. на ставки"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "бр. на налог за набавка"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Налог (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(ажурирај)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -524,6 +526,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Средна цена"
@@ -581,8 +588,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -610,7 +617,7 @@ msgid "Can be Purchased"
msgstr "Може да се набави"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -631,18 +638,22 @@ msgid "Cancelled"
msgstr "Откажано"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Категорија"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -672,7 +683,7 @@ msgid "Configuration"
msgstr "Конфигурација"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Грешка во конфигурацијата!"
@@ -834,7 +845,6 @@ msgstr "Опис"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Одредиште"
@@ -869,7 +879,7 @@ msgid "Draft PO"
msgstr "Нацрт налог за набавка"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Нацрт налогот за набавка е креиран"
@@ -895,7 +905,7 @@ msgstr "Волшебник за креирање на e-mail"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Грешка!"
@@ -925,12 +935,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Фискален период"
@@ -1036,7 +1040,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Невалидна Постапка!"
@@ -1073,13 +1077,13 @@ msgid "Invoice Received"
msgstr "Примена фактура"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1239,6 +1243,11 @@ msgid "Messages and communication history"
msgstr "Историја на пораки и комуникација"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Нето цена"
@@ -1249,19 +1258,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Нема дефинирано адреса(и) за овој добавувач"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Нема дефинирано стандарден добавувач за овој производ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Нема дефинирано добавувач за овој производ !"
@@ -1304,7 +1313,6 @@ msgstr "Отвори го менито за набавки"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Датум на налогот"
@@ -1321,6 +1329,7 @@ msgstr "Ставки на налогот"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1362,7 +1371,7 @@ msgid "Outgoing Mails"
msgstr "Излезни e-mail пораки"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "Налог за набавка: %s"
@@ -1426,6 +1435,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Пре-генерирани нацрт фактури врз база на налози за набавка"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Типови на цени"
@@ -1468,7 +1482,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Производ"
@@ -1508,7 +1521,7 @@ msgid "Products by Category"
msgstr "Производи по категории"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1619,7 +1632,7 @@ msgid "Purchase Pricelist"
msgstr "Ценовник за набавки"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1672,12 +1685,11 @@ msgstr "Количина"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Количина"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1716,7 +1728,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1769,11 +1781,6 @@ msgid "Reference"
msgstr "Референца"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Референтна ЕМ"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Референтна единица мерка"
@@ -1859,7 +1866,7 @@ msgid "Select an Open Sales Order"
msgstr "Избери налог за отворена продажба"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1951,7 +1958,7 @@ msgid "Supplier Features"
msgstr "Функции на добавувачот"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1959,7 +1966,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Фактури од добавувач"
@@ -2002,7 +2009,7 @@ msgstr ""
"производи/количини."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2012,7 +2019,7 @@ msgstr ""
"изгледа како конфигурациска грешка!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2022,7 +2029,7 @@ msgstr ""
"помалку."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Избраниот добавувач го продава овој производ единствено по %s"
@@ -2050,7 +2057,7 @@ msgid "The total amount"
msgstr "Вкупен износ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2117,13 +2124,13 @@ msgid "Total amount"
msgstr "Вкупна сума"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Не може да се откаже налогот за набавка."
@@ -2144,6 +2151,11 @@ msgid "Unit Price"
msgstr "Единечна цена"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Категории на единица мерка"
@@ -2207,7 +2219,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Проверено од"
@@ -2223,15 +2234,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Магацин"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2261,7 +2271,13 @@ msgstr ""
"набавка."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2270,3 +2286,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Референца на вашиот налог"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Референтна ЕМ"
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 598780ebd8b..80765a746a7 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -7,89 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Худалдан авалтын захиалга нь ноорог байхад төлөв нь автоматаар 'Ноорог' "
-"байна. \n"
-"* Худалдан авалтын захиалгыг батлахад төлөв нь 'Батласан' болно. "
-" \n"
-"* Худалдан авалтын захиалга хийгдсэн дараа төлөв нь 'Хийгдсэн' болно. "
-" \n"
-"* Худалдан авалтын захиалгыг цуцласан бол төлөв 'Цуцласан' болно."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# Мөрийн"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Худалдан авалтын захиалгын тоо"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Захиалга (Код ${object.name or 'б/гүй' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(шинэчлэх)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -100,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -134,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -170,6 +101,7 @@ 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"
@@ -180,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -212,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -246,6 +178,76 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Худалдан авалтын захиалга нь ноорог байхад төлөв нь автоматаар 'Ноорог' "
+"байна. \n"
+"* Худалдан авалтын захиалгыг батлахад төлөв нь 'Батласан' болно. "
+" \n"
+"* Худалдан авалтын захиалга хийгдсэн дараа төлөв нь 'Хийгдсэн' болно. "
+" \n"
+"* Худалдан авалтын захиалгыг цуцласан бол төлөв 'Цуцласан' болно."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# Мөрийн"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Худалдан авалтын захиалгын тоо"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Захиалга (Код ${object.name or 'б/гүй' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(шинэчлэх)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -524,6 +526,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Дундаж үнэ"
@@ -581,8 +588,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -610,7 +617,7 @@ msgid "Can be Purchased"
msgstr "Худалдан авч болох"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -631,18 +638,22 @@ msgid "Cancelled"
msgstr "Цуцалсан"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Ангилал"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -672,7 +683,7 @@ msgid "Configuration"
msgstr "Тохиргоо"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Тохиргооны алдаа!"
@@ -834,7 +845,6 @@ msgstr "Тайлбар"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Хаана"
@@ -869,7 +879,7 @@ msgid "Draft PO"
msgstr "Ноорог PO"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ноорог үүсгэсэн худалдан авалтын захиалга"
@@ -895,7 +905,7 @@ msgstr "Имэйл үүсгэх харилцах цонх"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Алдаа!"
@@ -925,12 +935,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Санхүүгийн харгалзаа"
@@ -1038,7 +1042,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Буруу Үйлдэл!"
@@ -1075,13 +1079,13 @@ msgid "Invoice Received"
msgstr "Хүлээн авсан нэхэмжлэл"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1241,6 +1245,11 @@ msgid "Messages and communication history"
msgstr "Зурвас болон харилцсан түүх"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Цэвэр үнэ"
@@ -1251,19 +1260,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Нийлүүлэгчийн хаяг байхгүй"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Энэ бараанд нийлүүлэгч анхны утгаар тодорхойлогдоогүй байна"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Энэ бараанд нийлүүлэгч тодорхойлоогүй байна !"
@@ -1306,7 +1315,6 @@ msgstr "Худалдан авалтын цэс нээх"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Захиалах огноо"
@@ -1323,6 +1331,7 @@ msgstr "Захиалгын мөрүүд"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1364,7 +1373,7 @@ msgid "Outgoing Mails"
msgstr "Явсан мэйлүүд"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "ХАЗ: %s"
@@ -1429,6 +1438,11 @@ msgstr ""
"Худалдан авалтын захиалга дээр суурилан ноорог нэхэмжлэлийг урьдчилан үүсгэх"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Үнийн Төрлүүд"
@@ -1471,7 +1485,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Бараа"
@@ -1511,7 +1524,7 @@ msgid "Products by Category"
msgstr "Бараа ангиллаар"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1621,7 +1634,7 @@ msgid "Purchase Pricelist"
msgstr "Худалдан авах үнийн санал"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1673,12 +1686,11 @@ msgstr "Тоо"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Тоо ширхэг"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1717,7 +1729,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1770,11 +1782,6 @@ msgid "Reference"
msgstr "Дугаар"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Х.Н-н код"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Хэмжих нэгжийн код"
@@ -1860,7 +1867,7 @@ msgid "Select an Open Sales Order"
msgstr "Нээлттэй Борлуулалтын Захиалга сонгох"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1951,7 +1958,7 @@ msgid "Supplier Features"
msgstr "Нийлүүлэгчийн онцлог"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1959,7 +1966,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Нийлүүлэгчийн нэхэмжлэл"
@@ -2001,7 +2008,7 @@ msgstr ""
"бараа/тоо ширхэг дээр үндэслэн нийлүүлэгчийн үнийг тооцоолно."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2011,7 +2018,7 @@ msgstr ""
"алдаа бололтой байна!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2021,7 +2028,7 @@ msgstr ""
"байна. Үүнээс цөөнөөр худалдан авч болохгүй."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Сонгосон нийлүүлэгч нь энэ барааг зөвхөн %s-р борлуулдаг."
@@ -2049,7 +2056,7 @@ msgid "The total amount"
msgstr "Нийт хэмжээ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2115,13 +2122,13 @@ msgid "Total amount"
msgstr "Бүгд дүн"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Энэ худалдан авалтын захиалгыг цуцлаж боломжгүй."
@@ -2142,6 +2149,11 @@ msgid "Unit Price"
msgstr "Нэгж үнэ"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Хэмжих Нэгжийн Ангилалууд"
@@ -2205,7 +2217,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Баталсан"
@@ -2221,15 +2232,14 @@ msgstr "Нийлүүлэгчийн магадлагааг хүлээж буй"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Агуулах"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2257,7 +2267,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Мөр байхгүй худалдан авалтын захиалгыг батлаж болохгүй."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2268,3 +2284,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Таны захиалгын код"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Х.Н-н код"
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index baaefa4695d..fc15206a9a3 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -7,83 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# linjer"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-"$ {object.company_id.name} Bestill (Ref $ {object.name eller 'n / a'})"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -94,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -128,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -164,6 +101,7 @@ 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"
@@ -174,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -206,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -240,6 +178,70 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+"$ {object.company_id.name} Bestill (Ref $ {object.name eller 'n / a'})"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -485,6 +487,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Gjennomsnittspris"
@@ -542,8 +549,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -571,7 +578,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -592,18 +599,22 @@ msgid "Cancelled"
msgstr "Annulert"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -633,7 +644,7 @@ msgid "Configuration"
msgstr "Konfigurasjon"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -795,7 +806,6 @@ msgstr "Beskrivelse"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destinasjon"
@@ -830,7 +840,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -856,7 +866,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -886,12 +896,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Regnskapsstatus"
@@ -995,7 +999,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1032,13 +1036,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1198,6 +1202,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Nettopris"
@@ -1208,19 +1217,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1263,7 +1272,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Ordredato"
@@ -1280,6 +1288,7 @@ msgstr "Ordrelinjer"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1321,7 +1330,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1385,6 +1394,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1427,7 +1441,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produkt"
@@ -1467,7 +1480,7 @@ msgid "Products by Category"
msgstr "Produktkategorier"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1577,7 +1590,7 @@ msgid "Purchase Pricelist"
msgstr "Innkjøpsprisliste"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1627,12 +1640,11 @@ msgstr "Antall"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Antall"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1671,7 +1683,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1724,11 +1736,6 @@ msgid "Reference"
msgstr "Referanse"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referanse UOM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1812,7 +1819,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1901,7 +1908,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1909,7 +1916,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Leverandørfakturaer"
@@ -1951,7 +1958,7 @@ msgstr ""
"leverandørpris for valgte produkter og mengder."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1959,7 +1966,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1969,7 +1976,7 @@ msgstr ""
"kjøpe mindre."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valgte leverandøren selger dette produktet bare som %s"
@@ -1997,7 +2004,7 @@ msgid "The total amount"
msgstr "Totalsum"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2064,13 +2071,13 @@ msgid "Total amount"
msgstr "Totalsum"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2089,6 +2096,11 @@ msgid "Unit Price"
msgstr "Enhetspris"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2152,7 +2164,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Bekreftet av"
@@ -2168,15 +2179,14 @@ msgstr "Avventer leverandørgodkj."
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Lager"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2204,7 +2214,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, 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."
@@ -2213,3 +2229,6 @@ msgstr "Du må først annullere alle fakturaer tilhørende innkjøpsordren."
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Din ordrereferanse"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referanse UOM"
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index f4baf1f62ef..cea9af3f236 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -7,94 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-09-17 08:00+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-09-29 18:23+0000\n"
"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
"Language-Team: Dutch <nl@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: 2014-09-19 08:21+0000\n"
+"X-Launchpad-Export-Date: 2014-09-30 07:24+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-"\n"
-"Maakt de dropship route aan en voegt meer complexe testen toe.\n"
-"- Dit installeert de module stock_dropshipping."
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * De 'Concept' status wordt automatisch gezet als inkooporder wordt "
-"ingevoerd. \n"
-"* De 'Akkoord' status wordt automatisch gezet nadat de inkooporder is "
-"bevestigd. \n"
-"* De 'Gereed' status wordt automatisch gezet als de inkooporder klaar is. "
-" \n"
-"* De 'Geannuleerd' status wordt automatisch gezet als de gebruiker de "
-"inkooporder annuleert."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Kopen"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "# Inkopen"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "# Inkoopfacturen"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# Regels"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# inkooporder"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name|safe} Order (Referentie ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(bijwerken)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -105,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -139,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,38 +97,40 @@ msgid ""
"</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>Hallo ${object.partner_id.name},</p>\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
" \n"
-" <p>Hier is een ${object.state in ('draft', 'sent') and 'offerte "
-"aanvraag' or 'inkooporder bevestiging'} van ${object.company_id.name}: </p>\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"
-"   <strong>REFERENTIES</strong><br>\n"
-"   Ordernummer: <strong>${object.name}</strong><br>\n"
-"   Ordertotaal: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Orderdatum: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENTIES</strong><br />\n"
+" &nbsp;&nbsp;Ordernummer: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Ordertotaal: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Orderdatum: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Orderreferentie: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Uw referentie: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Uw referentie: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Uw contactpersoon: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Uw contactpersoon: <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>Indien u vragen heeft, aarzel dan niet om contact met ons op te "
-"nemen.</p>\n"
+" <br/>\n"
+" <p>Als er nog vragen zijn kunt u contact opnemen met ons.</p>\n"
" <p>Dank u!</p>\n"
-" <br>\n"
-" <br>\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"
@@ -215,30 +143,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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"
-" Telefoon:  ${object.company_id.phone}\n"
+" Telefoon:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Website: <a "
+" Website:&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -250,6 +178,7 @@ 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"
@@ -260,26 +189,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -292,30 +221,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -324,36 +253,38 @@ msgid ""
"</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>Hallo ${object.partner_id.name},</p>\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
" \n"
-" <p>Hier is een ${object.state in ('draft', 'sent') and 'offerte "
-"aanvraag' or 'inkooporder bevestiging'} from ${object.company_id.name}: "
+" <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"
-"   <strong>REFERENTIES</strong><br>\n"
-"   Inkoopordernummer: <strong>${object.name}</strong><br>\n"
-"   Inkooporderdatum: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENTIES</strong><br />\n"
+" &nbsp;&nbsp;Aanvraagnumber: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Aanvraagdatum: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Inkooporder referentie: ${object.origin}<br>\n"
+" &nbsp;&nbsp;aanvraagreferentie: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Uw referentie: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Uw referentie: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\n"
+" &nbsp;&nbsp;Uw contactpersoon: <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>Als u vragen heeft, aarzel dan niet contact met ons op te nemen.</p>\n"
+" <br/>\n"
+" <p>Als er nog vragen zijn kunt u contact opnemen met ons.</p>\n"
" <p>Dank u!</p>\n"
-" <br>\n"
-" <br>\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"
@@ -366,30 +297,30 @@ msgstr ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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"
-" Telefoon:  ${object.company_id.phone}\n"
+" Telefoon:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Website: <a "
+" Website:&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -399,6 +330,81 @@ msgstr ""
" "
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+"\n"
+"Maakt de dropship route aan en voegt meer complexe testen toe.\n"
+"- Dit installeert de module stock_dropshipping."
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * De 'Concept' status wordt automatisch gezet als inkooporder wordt "
+"ingevoerd. \n"
+"* De 'Akkoord' status wordt automatisch gezet nadat de inkooporder is "
+"bevestigd. \n"
+"* De 'Gereed' status wordt automatisch gezet als de inkooporder klaar is. "
+" \n"
+"* De 'Geannuleerd' status wordt automatisch gezet als de gebruiker de "
+"inkooporder annuleert."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Kopen"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "# Inkopen"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "# Inkoopfacturen"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# Regels"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Inkooporders"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name|safe} Order (Referentie ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(bijwerken)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -775,6 +781,11 @@ msgid "Associated procurements"
msgstr "Bijbehorende verwervingen"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr "Gemiddelde levertijd"
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Gemiddelde prijs"
@@ -839,8 +850,8 @@ msgid "Bid Valid Until"
msgstr "Bieding geldig t/m"
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "Kopen"
@@ -873,7 +884,7 @@ msgid "Can be Purchased"
msgstr "Inkoop product"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr "Kan geen algemene koop route vinden."
@@ -894,19 +905,23 @@ msgid "Cancelled"
msgstr "Geannuleerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
"Het is niet mogelijk ene inkooporder te verwijderen in de '%s\"status."
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr "Categorie van het product"
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr "Kies uit de verschillende aanbestedingen"
@@ -936,7 +951,7 @@ msgid "Configuration"
msgstr "Instellingen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Configuratiefout!"
@@ -1100,7 +1115,6 @@ msgstr "Omschrijving"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Bestemming"
@@ -1137,7 +1151,7 @@ msgid "Draft PO"
msgstr "Concept inkoopporder"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Concept inkooporder aangemaakt."
@@ -1163,7 +1177,7 @@ msgstr "E-mail samenstellen wizard"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Fout!"
@@ -1193,13 +1207,6 @@ msgid "Extended Filters"
msgstr "Uitgebreide filters"
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-"Annuleer eerst alle inkomende leveringen behorende bij deze inkooporder."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
@@ -1313,7 +1320,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Ongeldige actie!"
@@ -1350,13 +1357,13 @@ msgid "Invoice Received"
msgstr "Factuur ontvangen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "Factuur betaald"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr "Factuur ontvangen"
@@ -1520,6 +1527,11 @@ msgid "Messages and communication history"
msgstr "Berichten en communicatie historie"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr "Maandelijkse inkopen"
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Netto-prijs"
@@ -1530,19 +1542,19 @@ msgid "New Mail"
msgstr "Nieuwe e-mail"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Geen adres gedefinieerd voor de leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Geen standaard leverancier gedefinieerd voor dit product"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Geen leverancier voor dit product opgegeven!"
@@ -1585,7 +1597,6 @@ msgstr "Inkoop menu openen"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Orderdatum"
@@ -1602,6 +1613,7 @@ msgstr "Orderregels"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "Bestel maand"
@@ -1643,7 +1655,7 @@ msgid "Outgoing Mails"
msgstr "Uitgaande E-mails"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
@@ -1716,6 +1728,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Vooraf gegenereerde facturen gebaseerd op inkooporders"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr "Prijs per leverancier"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Prijs types"
@@ -1741,7 +1758,7 @@ msgstr "Prijslijsten"
#. module: purchase
#: view:purchase.order:purchase.purchase_order_form
msgid "Print RFQ"
-msgstr "Print offerteaanvraag"
+msgstr "Offerteaanvraag afdrukken"
#. module: purchase
#: model:ir.model,name:purchase.model_procurement_order
@@ -1758,7 +1775,6 @@ msgstr "Verwerving regel"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Product"
@@ -1798,7 +1814,7 @@ msgid "Products by Category"
msgstr "Producten op categorie"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr "Producten ontvangen"
@@ -1911,7 +1927,7 @@ msgid "Purchase Pricelist"
msgstr "Inkoopprijslijst"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr "Inkooporderregel aangemaakt en gekoppeld aan bestaande inkooporder"
@@ -1963,12 +1979,11 @@ msgstr "Hvhd"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Hoeveelheid"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr "Hoeveelheid toegevoegd aan bestaande inkooporderregel"
@@ -2007,7 +2022,7 @@ msgstr "Offerteaanvraag gereed"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "Offerteaanvraag aangemaakt"
@@ -2025,7 +2040,7 @@ msgstr "Offertes en inkopen"
#. module: purchase
#: view:purchase.order:purchase.purchase_order_form
msgid "Re-Print RFQ"
-msgstr "Opnieuw afdrukken offerteaanvraag"
+msgstr "Offerteaanvraag opnieuw afdrukken"
#. module: purchase
#: view:purchase.order:purchase.purchase_order_form
@@ -2060,11 +2075,6 @@ msgid "Reference"
msgstr "Referentie"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referentie eenheid"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Maateenheid referentie"
@@ -2154,7 +2164,7 @@ msgid "Select an Open Sales Order"
msgstr "Selecteer een open verkooprder"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -2246,7 +2256,7 @@ msgid "Supplier Features"
msgstr "Leveranciersopties"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr "Lev. factuur"
@@ -2254,7 +2264,7 @@ msgstr "Lev. factuur"
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Inkoopfacturen"
@@ -2296,7 +2306,7 @@ msgstr ""
"inkoopprijs voor de geselecteerd producten."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2306,7 +2316,7 @@ msgstr ""
"een instellingsfout te zijn!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2316,7 +2326,7 @@ msgstr ""
"ingesteld. U zou niet minder moeten bestellen."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -2350,7 +2360,7 @@ msgid "The total amount"
msgstr "Het totaalbedrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr "Er is geen leverancier gekoppeld aan dit product %s"
@@ -2418,13 +2428,13 @@ msgid "Total amount"
msgstr "Totaalbedrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr "Niet mogelijk om de inkooporder te annuleren %s."
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Niet mogelijk deze Inkoopporders te annuleren."
@@ -2445,6 +2455,11 @@ msgid "Unit Price"
msgstr "Prijs"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr "Eenheid hoeveelheid"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Maateenheid categorieën"
@@ -2508,7 +2523,6 @@ msgstr "Gevalideerd door:"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Goedgekeurd door"
@@ -2524,15 +2538,14 @@ msgstr "Wacht lever. bevest."
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Magazijn"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2562,7 +2575,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Het is niet mogelijk een Inkoopporders zonder regels te bevestigen."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr "U heeft hier al goederen van ontvangen. "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2573,3 +2592,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Uw orderreferentie"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referentie eenheid"
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 90dfb68104c..9e3bea0d58d 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Dutch (Belgium) <nl_BE@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# lijnen"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# lijnen"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Gemiddelde prijs"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Geannuleerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Instellingen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Omschrijving"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Bestemming"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Nettoprijs"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Besteldatum"
@@ -1279,6 +1287,7 @@ msgstr "Orderlijnen"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "AO: %s"
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Product"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "Producten per categorie"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1576,7 +1589,7 @@ msgid "Purchase Pricelist"
msgstr "Aankoopprijslijst"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1626,12 +1639,11 @@ msgstr "Hvh"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Hoeveelheid"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1670,7 +1682,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1723,11 +1735,6 @@ msgid "Reference"
msgstr "Referentie"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referentie-eenheid"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1811,7 +1818,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1900,7 +1907,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1908,7 +1915,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Aankoopfacturen"
@@ -1950,7 +1957,7 @@ msgstr ""
"de gekozen producten / hoeveelheden wordt hiermee berekend."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1958,7 +1965,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1968,7 +1975,7 @@ msgstr ""
"minder bestellen."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De gekozen leverancier verkoopt dit product enkel per %s"
@@ -1996,7 +2003,7 @@ msgid "The total amount"
msgstr "Het totale bedrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2062,13 +2069,13 @@ msgid "Total amount"
msgstr "Totaalbedrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2087,6 +2094,11 @@ msgid "Unit Price"
msgstr "Eenheidsprijs"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2150,7 +2162,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Goedgekeurd door"
@@ -2166,15 +2177,14 @@ msgstr "Wachten op bev. leverancier"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Magazijn"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2202,7 +2212,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "U moet eerst alle facturen voor deze aankooporder annuleren."
@@ -2211,3 +2227,6 @@ msgstr "U moet eerst alle facturen voor deze aankooporder annuleren."
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Uw referentie"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referentie-eenheid"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 7154e3ddefd..341fe82c44e 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -7,90 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-09-22 14:19+0000\n"
"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
"Language-Team: Polish <pl@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: 2014-09-23 07:26+0000\n"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Stan 'Projekt' jest nadawany automatycznie po utworzeniu zamówienia "
-"zakupu. \n"
-"* Stan 'Potwierdzone' jest nadawany po potwierdzeniu. "
-" \n"
-"* Stan 'Wykonano' jest nadawany po wykonaniu. "
-" \n"
-"* Stan 'Anulowano' nadawany jest po anulowaniu."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Kupno"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "# Zamówienia"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "# Faktury dostawców"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# pozycji"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# Zamówień zakupu"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name|safe} Zamówienie (Odn. ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(aktualizuj)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -101,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -135,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -171,6 +101,7 @@ 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"
@@ -181,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -213,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -247,6 +178,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Stan 'Projekt' jest nadawany automatycznie po utworzeniu zamówienia "
+"zakupu. \n"
+"* Stan 'Potwierdzone' jest nadawany po potwierdzeniu. "
+" \n"
+"* Stan 'Wykonano' jest nadawany po wykonaniu. "
+" \n"
+"* Stan 'Anulowano' nadawany jest po anulowaniu."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Kupno"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "# Zamówienia"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "# Faktury dostawców"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# pozycji"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Zamówień zakupu"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name|safe} Zamówienie (Odn. ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(aktualizuj)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -520,6 +522,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Cena przeciętna"
@@ -577,8 +584,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "Kupno"
@@ -606,7 +613,7 @@ msgid "Can be Purchased"
msgstr "Może być kupowane"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -627,18 +634,22 @@ msgid "Cancelled"
msgstr "Anulowano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategoria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -668,7 +679,7 @@ msgid "Configuration"
msgstr "Konfiguracja"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Błąd konfiguracji!"
@@ -830,7 +841,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Przeznaczenie"
@@ -865,7 +875,7 @@ msgid "Draft PO"
msgstr "Projekt zamówienia"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Projekt zamówienia zakupu utworzono"
@@ -891,7 +901,7 @@ msgstr "Kreator email"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Błąd!"
@@ -921,12 +931,6 @@ msgid "Extended Filters"
msgstr "Rozszerzone filtry"
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Obszar podatkowy"
@@ -1035,7 +1039,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Niedozwolona akcja!"
@@ -1072,13 +1076,13 @@ msgid "Invoice Received"
msgstr "fakturę otrzymano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "Faktua zapłacona"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1238,6 +1242,11 @@ msgid "Messages and communication history"
msgstr "Wiadomości i historia komunikacji"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Cena netto"
@@ -1248,19 +1257,19 @@ msgid "New Mail"
msgstr "Nowa wiadomość email"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nie zdefiniowano adresu dla dostawcy"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Brak dostawcy dla tego produktu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nie zdefiniowano dostawcy dla tego produktu!"
@@ -1303,7 +1312,6 @@ msgstr "Otwórz menu Zakupów"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data zamówienia"
@@ -1320,6 +1328,7 @@ msgstr "Pozycje zamówienia"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "Miesiąc zamówienia"
@@ -1361,7 +1370,7 @@ msgid "Outgoing Mails"
msgstr "Wychodzace"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "ZZ: %s"
@@ -1425,6 +1434,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Wygeneruj projekt faktury na podstawie zamówienia zakupu"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Typy cen"
@@ -1467,7 +1481,6 @@ msgstr "Reguła zapotrzebowania"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produkt"
@@ -1507,7 +1520,7 @@ msgid "Products by Category"
msgstr "Produkty wg kategorii"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1616,7 +1629,7 @@ msgid "Purchase Pricelist"
msgstr "Cennik zakupów"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1668,12 +1681,11 @@ msgstr "Il."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Ilość"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1712,7 +1724,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1765,11 +1777,6 @@ msgid "Reference"
msgstr "Odnośnik"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "JM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referencyjna jednostka miary"
@@ -1853,7 +1860,7 @@ msgid "Select an Open Sales Order"
msgstr "Wybierz otwarte zamówienia sprzedaży"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1944,7 +1951,7 @@ msgid "Supplier Features"
msgstr "Funkcje dostawcy"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1952,7 +1959,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faktury od dostawców"
@@ -1994,7 +2001,7 @@ msgstr ""
"jest obliczana z tego cennika."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2002,7 +2009,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2012,7 +2019,7 @@ msgstr ""
"mniej."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -2040,7 +2047,7 @@ msgid "The total amount"
msgstr "Suma kwot"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2106,13 +2113,13 @@ msgid "Total amount"
msgstr "Suma kwot"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Nie mozna anulować tego zamówienia zakupu."
@@ -2133,6 +2140,11 @@ msgid "Unit Price"
msgstr "Cena jednostkowa"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Kategorie jednostek miary"
@@ -2196,7 +2208,6 @@ msgstr "Zatwierdzone przez:"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Zatwierdzone przez"
@@ -2212,15 +2223,14 @@ msgstr "Oczekuje potwierdzenia dostawcy"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Magazyn"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2248,7 +2258,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Nie można potwierdzać zamówienia zakupu bez pozycji."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2258,3 +2274,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Odnośnik zamówienia"
+
+#~ msgid "Reference UOM"
+#~ msgstr "JM"
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 6e9b6439606..2b0a98eae47 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -7,93 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-09-18 15:27+0000\n"
"Last-Translator: Opencloud - PT <Unknown>\n"
"Language-Team: Portuguese <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: 2014-09-19 08:21+0000\n"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-"\n"
-"Cria uma rota de entrega de mercadorias virtuais (dropshipping) e adiciona "
-"mais testes complexos - Instala o módulo stock_dropshipping."
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * O estado 'Rascunho' é definido automaticamente quando a ordem de compra é "
-"criada e gravada. \n"
-"* O estado 'Confirmado' é definido automaticamente como confirmação quando a "
-"ordem de compra é confirmada. \n"
-"* O estado 'Encerrado' é definido automaticamente quando a ordem de compra é "
-"definido como feito. \n"
-"* O estado 'Cancelado' é definida automaticamente quando o utilizador anula "
-"a ordem de compra."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Compra"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "# Compras"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "# Faturas de Fornecedores"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# de Ordens de Compra"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name|safe} Ordem (Nº ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Ordem (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(atualização)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -104,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -138,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -174,6 +101,7 @@ 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"
@@ -184,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -216,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -250,6 +178,80 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+"\n"
+"Cria uma rota de entrega de mercadorias virtuais (dropshipping) e adiciona "
+"mais testes complexos - Instala o módulo stock_dropshipping."
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * O estado 'Rascunho' é definido automaticamente quando a ordem de compra é "
+"criada e gravada. \n"
+"* O estado 'Confirmado' é definido automaticamente como confirmação quando a "
+"ordem de compra é confirmada. \n"
+"* O estado 'Encerrado' é definido automaticamente quando a ordem de compra é "
+"definido como feito. \n"
+"* O estado 'Cancelado' é definida automaticamente quando o utilizador anula "
+"a ordem de compra."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Compra"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "# Compras"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "# Faturas de Fornecedores"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# de Ordens de Compra"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name|safe} Ordem (Nº ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Ordem (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(atualização)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -615,6 +617,11 @@ msgid "Associated procurements"
msgstr "Contratos Associados"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Preço Médio"
@@ -679,8 +686,8 @@ msgid "Bid Valid Until"
msgstr "Proposta válida até"
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "Compra"
@@ -715,7 +722,7 @@ msgid "Can be Purchased"
msgstr "Pode ser comprado"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr "Não é possível localizar qualquer rota genérica para Comprar"
@@ -736,7 +743,7 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -744,12 +751,16 @@ msgstr ""
"'%s'."
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr "Escolha a partir de várias propostas numa convocatória de licitação"
@@ -779,7 +790,7 @@ msgid "Configuration"
msgstr "Configuração"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Erro de Configuração!"
@@ -943,7 +954,6 @@ msgstr "Descrição"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destino"
@@ -980,7 +990,7 @@ msgid "Draft PO"
msgstr "Ordem de Compra em Rascunho"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Rascunho de Ordem de Compra Criado"
@@ -1006,7 +1016,7 @@ msgstr "Assistente composição de Email"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Erro!"
@@ -1036,13 +1046,6 @@ msgid "Extended Filters"
msgstr "Extenção de Filtros"
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-"Primeiro cancelar todos os recepções relacionadas com esta ordem de compra."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posição Fiscal"
@@ -1154,7 +1157,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Acção Inválida!"
@@ -1191,13 +1194,13 @@ msgid "Invoice Received"
msgstr "Fatura Recebida"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "Fatura Paga"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr "Fatura Recebida"
@@ -1360,6 +1363,11 @@ msgid "Messages and communication history"
msgstr "Mensagens e histórico de comunicação"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Preço total líquido"
@@ -1370,19 +1378,19 @@ msgid "New Mail"
msgstr "Novo Mail"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Fornecedor sem mensagem definida"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Produto sem fornecedor padrão definido"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Produto sem fornecedor definido !"
@@ -1425,7 +1433,6 @@ msgstr "Menu de Abertura de Compra"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data de Ordem"
@@ -1442,6 +1449,7 @@ msgstr "Linhas de Ordem"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "Mês de Ordem"
@@ -1483,7 +1491,7 @@ msgid "Outgoing Mails"
msgstr "Emails de Saída"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "OC: %s"
@@ -1558,6 +1566,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Pré-gerar projectos de faturas com base em ordens de compra"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipos de Preço"
@@ -1600,7 +1613,6 @@ msgstr "Regras de Compra"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Artigo"
@@ -1640,7 +1652,7 @@ msgid "Products by Category"
msgstr "Produtos por Categoria"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr "Produtos Recebidos"
@@ -1754,7 +1766,7 @@ msgid "Purchase Pricelist"
msgstr "Lista de Preços de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr "Linhas de compra criada e associada a Ordem de Compra existente"
@@ -1806,12 +1818,11 @@ msgstr "Qtd"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr "Quantidade adicionadanuma Linha de Ordem de Compra existente"
@@ -1850,7 +1861,7 @@ msgstr "Cotação Feita"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "Cotação Criada"
@@ -1903,11 +1914,6 @@ msgid "Reference"
msgstr "Referência"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referência de UdM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referência de Unidade de Medida"
@@ -1997,7 +2003,7 @@ msgid "Select an Open Sales Order"
msgstr "Selecionar uma Ordem de Venda Aberta"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -2089,7 +2095,7 @@ msgid "Supplier Features"
msgstr "Características de Fornecedor"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr "Inv. Fornecedor"
@@ -2097,7 +2103,7 @@ msgstr "Inv. Fornecedor"
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faturas de Fornecedor"
@@ -2140,7 +2146,7 @@ msgstr ""
"selecionados."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2150,7 +2156,7 @@ msgstr ""
"ser um erro de configuração!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2160,7 +2166,7 @@ msgstr ""
"deve comprar menos."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O Fornecedor selecionado só vende este produto por %s"
@@ -2195,7 +2201,7 @@ msgid "The total amount"
msgstr "O montante total"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr "Não há fornecedor associado ao produto %s"
@@ -2263,13 +2269,13 @@ msgid "Total amount"
msgstr "Total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr "Não é possível cancelar o pedido de compra %s."
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Não é possível cancelar este pedido de compra."
@@ -2290,6 +2296,11 @@ msgid "Unit Price"
msgstr "Preço Unitário"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Categorias de Unidades de Medida"
@@ -2353,7 +2364,6 @@ msgstr "Validado por:"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validado por:"
@@ -2369,15 +2379,14 @@ msgstr "Espera de Fornecedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Armazém"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2408,7 +2417,13 @@ msgstr ""
"compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2419,3 +2434,11 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Seu Pedido de Referência"
+
+#, python-format
+#~ msgid "First cancel all receipts related to this purchase order."
+#~ msgstr ""
+#~ "Primeiro cancelar todos os recepções relacionadas com esta ordem de compra."
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referência de UdM"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index f30edd5fa41..65c42be90e2 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-09-14 01:52+0000\n"
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
"<webmaster@zupy.com.br>\n"
@@ -15,83 +15,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-14 08:33+0000\n"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * A situação 'Provisória' é definida automaticamente quando a ordem de "
-"compra no estado provisório.\n"
-"* A situação 'Confirmada' é definida automaticamente quando a ordem de "
-"compra for confirmada.\n"
-"* A situação 'Concluído' é definida automaticamente quando a ordem de compra "
-"é definida como concluída.\n"
-"* A situação 'Cancelado' é definido automaticamente quando o usuário "
-"cancelar a ordem de compra."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " Comprar"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "# Compras"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "# Faturas de Fornecedor"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# de Ordem de Compra"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name|safe} Ordem (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(atualizar)"
-
-#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -102,28 +32,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -136,30 +66,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -172,6 +102,7 @@ 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"
@@ -182,26 +113,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -214,30 +145,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -248,6 +179,77 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * A situação 'Provisória' é definida automaticamente quando a ordem de "
+"compra no estado provisório.\n"
+"* A situação 'Confirmada' é definida automaticamente quando a ordem de "
+"compra for confirmada.\n"
+"* A situação 'Concluído' é definida automaticamente quando a ordem de compra "
+"é definida como concluída.\n"
+"* A situação 'Cancelado' é definido automaticamente quando o usuário "
+"cancelar a ordem de compra."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " Comprar"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "# Compras"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "# Faturas de Fornecedor"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# de Ordem de Compra"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name|safe} Ordem (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(atualizar)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -526,6 +528,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Preço Médio"
@@ -583,8 +590,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -612,7 +619,7 @@ msgid "Can be Purchased"
msgstr "Pode ser Comprado"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -633,18 +640,22 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -674,7 +685,7 @@ msgid "Configuration"
msgstr "Configuração"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Erro de Configuração!"
@@ -836,7 +847,6 @@ msgstr "Descrição"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Local Destino"
@@ -871,7 +881,7 @@ msgid "Draft PO"
msgstr "OC Provisória"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ordem de Compra provisória gerada"
@@ -897,7 +907,7 @@ msgstr "Assistente de composição de Email"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Erro!"
@@ -927,12 +937,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posição Fiscal"
@@ -1040,7 +1044,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Ação Inválida!"
@@ -1077,13 +1081,13 @@ msgid "Invoice Received"
msgstr "Fatura Recebida"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1247,6 +1251,11 @@ msgid "Messages and communication history"
msgstr "Histórico de mensagens e comunicação"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Preço Líquido"
@@ -1257,19 +1266,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nenhum endereço definido para o fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Nenhum fornecedor padrão definido para este produto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nenhum fornecedor definido para este produto!"
@@ -1312,7 +1321,6 @@ msgstr "Abrir Menu de Compras"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data da Ordem"
@@ -1329,6 +1337,7 @@ msgstr "Linhas do Pedido"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1370,7 +1379,7 @@ msgid "Outgoing Mails"
msgstr "E-mails Enviados"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1434,6 +1443,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Faturas pré-geradas baseada em ordens de compra"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipos de Preço"
@@ -1476,7 +1490,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produto"
@@ -1516,7 +1529,7 @@ msgid "Products by Category"
msgstr "Produtos por Categoria"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1627,7 +1640,7 @@ msgid "Purchase Pricelist"
msgstr "Lista de Preço de Compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1679,12 +1692,11 @@ msgstr "Qtd"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1776,11 +1788,6 @@ msgid "Reference"
msgstr "Referência"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "UM Referencial"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Unidade de Medida referencial"
@@ -1866,7 +1873,7 @@ msgid "Select an Open Sales Order"
msgstr "Escolha um Pedido de Vendas Aberto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1958,7 +1965,7 @@ msgid "Supplier Features"
msgstr "Recursos do Fornecedor"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1966,7 +1973,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faturas de Fornecedores"
@@ -2008,7 +2015,7 @@ msgstr ""
"calcula o preço do fornecedor para os produtos/quantidades selecionadas."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2018,7 +2025,7 @@ msgstr ""
"ser um erro de configuração!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2028,7 +2035,7 @@ msgstr ""
"você não deve comprar menos."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -2056,7 +2063,7 @@ msgid "The total amount"
msgstr "O Valor Total"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2123,13 +2130,13 @@ msgid "Total amount"
msgstr "Valor total"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Não foi possível cancelar esta ordem de compra."
@@ -2150,6 +2157,11 @@ msgid "Unit Price"
msgstr "Preço Unitário"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. 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"
@@ -2213,7 +2225,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validado Por"
@@ -2229,15 +2240,14 @@ msgstr "Aguardando Confirmação do Fornecedor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Armazém"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2266,7 +2276,13 @@ msgstr ""
"Você não pode confirmar uma ordem de compra sem nenhuma linha de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2277,3 +2293,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Sua Refêrencia do Pedido de Compra"
+
+#~ msgid "Reference UOM"
+#~ msgstr "UM Referencial"
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 6648e32ccd7..9ea7b224f10 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -7,91 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Romanian <ro@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Starea 'Ciorna' este setata automat atunci cand comanda de aschizitie se "
-"afla in starea de ciorna. \n"
-"* Starea 'Confirmat' este setata automat ca si confirmata atunci cand "
-"comanda de achizitie este in starea confirmata. "
-" \n"
-"* Starea 'Efectaut' este setata automat atunci cand comanda de achizitie "
-"este setata ca efectuata. \n"
-"* Starea 'Anulat' este setata automat atunci cand utilizatorul anuleaza "
-"comanda de achizitie."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linii"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# Comenzii de Achizitie"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Comanda (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(actualizare)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -102,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -136,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -172,6 +101,7 @@ 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"
@@ -182,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -214,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -248,6 +178,78 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Starea 'Ciorna' este setata automat atunci cand comanda de aschizitie se "
+"afla in starea de ciorna. \n"
+"* Starea 'Confirmat' este setata automat ca si confirmata atunci cand "
+"comanda de achizitie este in starea confirmata. "
+" \n"
+"* Starea 'Efectaut' este setata automat atunci cand comanda de achizitie "
+"este setata ca efectuata. \n"
+"* Starea 'Anulat' este setata automat atunci cand utilizatorul anuleaza "
+"comanda de achizitie."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linii"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# Comenzii de Achizitie"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Comanda (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(actualizare)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -532,6 +534,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Preț mediu"
@@ -589,8 +596,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -618,7 +625,7 @@ msgid "Can be Purchased"
msgstr "Poate fi achizitionat"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -639,18 +646,22 @@ msgid "Cancelled"
msgstr "Anulat(a)"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -680,7 +691,7 @@ msgid "Configuration"
msgstr "Configurare"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Eroare de configurare!"
@@ -843,7 +854,6 @@ msgstr "Descriere"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destinatie"
@@ -878,7 +888,7 @@ msgid "Draft PO"
msgstr "PO Ciorna"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Comanda de cumparare Ciorna creata"
@@ -904,7 +914,7 @@ msgstr "Wizardul de compunere email-uri"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Eroare!"
@@ -934,12 +944,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Pozitie fiscala"
@@ -1046,7 +1050,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Actiune Nevalida!"
@@ -1083,13 +1087,13 @@ msgid "Invoice Received"
msgstr "Factura Primita"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1249,6 +1253,11 @@ msgid "Messages and communication history"
msgstr "Istoric mesaje si conversatii"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Pret Net"
@@ -1259,19 +1268,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Nu exista nici o adresa definita pentru furnizor"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Nu exista niciun furnizor implicit definit pentru acest produs"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Nu exista nici un furnizor definit pentru acest produs !"
@@ -1314,7 +1323,6 @@ msgstr "Deschide Meniul de Achizitii"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Data comenzii"
@@ -1331,6 +1339,7 @@ msgstr "Pozitii comanda"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1372,7 +1381,7 @@ msgid "Outgoing Mails"
msgstr "Email-uri Expediate"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1438,6 +1447,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Pre-genereaza facturi ciorna pe baza comenzilor de achizitie"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tipuri de Preturi"
@@ -1480,7 +1494,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Produs"
@@ -1520,7 +1533,7 @@ msgid "Products by Category"
msgstr "Produse dupa Categorie"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1631,7 +1644,7 @@ msgid "Purchase Pricelist"
msgstr "Listă prețuri achiziție"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1684,12 +1697,11 @@ msgstr "Cantitate"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Cantitate"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1728,7 +1740,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1781,11 +1793,6 @@ msgid "Reference"
msgstr "Referință"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "UdM de referinta"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Unitatea de Masura de Referinta"
@@ -1871,7 +1878,7 @@ msgid "Select an Open Sales Order"
msgstr "Selectati o Comanda de Vanzare Deschisa"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1964,7 +1971,7 @@ msgid "Supplier Features"
msgstr "Caracteristici Furnizori"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1972,7 +1979,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Facturi furnizori"
@@ -2015,7 +2022,7 @@ msgstr ""
"produsele/cantitatile selectate."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2025,7 +2032,7 @@ msgstr ""
"ce pare a fi o eroare de configurare!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2035,7 +2042,7 @@ msgstr ""
"cumparati mai putin."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Furnizorul selectat vinde acest produs doar după %s"
@@ -2063,7 +2070,7 @@ msgid "The total amount"
msgstr "Suma totala"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2130,13 +2137,13 @@ msgid "Total amount"
msgstr "Suma totala"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Imposibil de anulat aceasta comanda de cumparare."
@@ -2157,6 +2164,11 @@ msgid "Unit Price"
msgstr "Pret unitar"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Categorii ale Unitatii de Masura"
@@ -2220,7 +2232,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validat de catre"
@@ -2236,15 +2247,14 @@ msgstr "Confirmare Furnizor in asteptare"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Depozit"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2274,7 +2284,13 @@ msgstr ""
"achizitie."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2285,3 +2301,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Referinta comenzii dumneavoastra"
+
+#~ msgid "Reference UOM"
+#~ msgstr "UdM de referinta"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 5bd9b9ebcf9..00dfac48494 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian <ru@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Кол-во позиций"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "№ заказа закупки"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(обновить)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Кол-во позиций"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "№ заказа закупки"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(обновить)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -485,6 +487,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Средняя цена"
@@ -542,8 +549,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -571,7 +578,7 @@ msgid "Can be Purchased"
msgstr "Можно закупать"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -592,18 +599,22 @@ msgid "Cancelled"
msgstr "Отменено"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Категория"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -633,7 +644,7 @@ msgid "Configuration"
msgstr "Конфигурация"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Ошибка конфигурации!"
@@ -795,7 +806,6 @@ msgstr "Описание"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Место назначения"
@@ -830,7 +840,7 @@ msgid "Draft PO"
msgstr "Черновик ЗЗ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Черновик заказа закупки создан"
@@ -856,7 +866,7 @@ msgstr "Мастер составления эл. почты"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Ошибка!"
@@ -886,12 +896,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Налоговая позиция"
@@ -997,7 +1001,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Неверное действие!"
@@ -1034,13 +1038,13 @@ msgid "Invoice Received"
msgstr "Счет получен"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1200,6 +1204,11 @@ msgid "Messages and communication history"
msgstr "Сообщения и история общения"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Цена до налогов"
@@ -1210,19 +1219,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Нет адреса поставщика"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Для товара не определен поставщик по умолчанию"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Не задан поставщик для этого товара!"
@@ -1265,7 +1274,6 @@ msgstr "Открыть меню закупок"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Дата заказа"
@@ -1282,6 +1290,7 @@ msgstr "Позиции заказа"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1323,7 +1332,7 @@ msgid "Outgoing Mails"
msgstr "Исходящие письма"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "ЗЗ: %s"
@@ -1387,6 +1396,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Предварительно генерировать счета, основанные на заказах закупки"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Типы цен"
@@ -1429,7 +1443,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Продукция"
@@ -1469,7 +1482,7 @@ msgid "Products by Category"
msgstr "ТМЦ по категориям"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1579,7 +1592,7 @@ msgid "Purchase Pricelist"
msgstr "Закупочный прайс-лист"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1631,12 +1644,11 @@ msgstr "Кол-во"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1675,7 +1687,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1728,11 +1740,6 @@ msgid "Reference"
msgstr "Ссылка"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Базовая ед.изм."
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Базовая единица измерения"
@@ -1818,7 +1825,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1909,7 +1916,7 @@ msgid "Supplier Features"
msgstr "Особенности поставщика"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1917,7 +1924,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Cчета поставщиков"
@@ -1959,7 +1966,7 @@ msgstr ""
"рассчитывается цена поставщика для выбранной продукции / количества."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1967,7 +1974,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1977,7 +1984,7 @@ msgstr ""
"можете закупить меньше."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -2005,7 +2012,7 @@ msgid "The total amount"
msgstr "Итого"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2071,13 +2078,13 @@ msgid "Total amount"
msgstr "Итоговая сумма"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Не удалось отменить это заказ."
@@ -2098,6 +2105,11 @@ msgid "Unit Price"
msgstr "Цена за ед."
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Категории единиц измерения"
@@ -2161,7 +2173,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Утверждено"
@@ -2177,15 +2188,14 @@ msgstr "Ожидание"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2213,7 +2223,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Вы не можете подтвердить заказ закупки без позиций заказа."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2224,3 +2240,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Ссылка вашего заказа"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Базовая ед.изм."
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index d017d15d480..003b35cdb90 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Cieľ"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Množstvo"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Faktúry dodávateľov"
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 03a0080b89b..4d470b55ff8 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr " Status nabavnega naloga"
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# št. vrstic"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "# od nabavnega naloga"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Naročilo (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(posodobi)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr " Status nabavnega naloga"
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# št. vrstic"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "# od nabavnega naloga"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Naročilo (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(posodobi)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -496,6 +498,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Povprečna cena"
@@ -553,8 +560,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -582,7 +589,7 @@ msgid "Can be Purchased"
msgstr "Se lahko nabavi"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -603,18 +610,22 @@ msgid "Cancelled"
msgstr "Preklicano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorija"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -644,7 +655,7 @@ msgid "Configuration"
msgstr "Nastavitve"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Napaka v nastavitvah"
@@ -806,7 +817,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Cilj"
@@ -841,7 +851,7 @@ msgid "Draft PO"
msgstr "Osnutek"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Osnutek nabavnega naloga je kreiran"
@@ -867,7 +877,7 @@ msgstr "Čarovnik za sestavljanje e-pošte"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Napaka!"
@@ -897,12 +907,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Davčna pozicija"
@@ -1006,7 +1010,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "Napačno dejanje!"
@@ -1043,13 +1047,13 @@ msgid "Invoice Received"
msgstr "Račun prejet"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1209,6 +1213,11 @@ msgid "Messages and communication history"
msgstr "Sporočila in zgodovina sporočil"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Neto cena"
@@ -1219,19 +1228,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Ni naslova dobavitelja"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Ni privzetega dobavitelja"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Dobavitelj ni določen!"
@@ -1274,7 +1283,6 @@ msgstr "Odpri meni nabave"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Datum Naročila"
@@ -1291,6 +1299,7 @@ msgstr "Postavke naloga"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1332,7 +1341,7 @@ msgid "Outgoing Mails"
msgstr "Odhajajoča sporočila"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "Nabavni nalog: %s"
@@ -1396,6 +1405,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Osnutki računov na osnovi nabavnih nalogov."
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Tip cene"
@@ -1438,7 +1452,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Izdelek"
@@ -1478,7 +1491,7 @@ msgid "Products by Category"
msgstr "Izdelki po kategorijah"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1588,7 +1601,7 @@ msgid "Purchase Pricelist"
msgstr "Nabavni cenik"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1640,12 +1653,11 @@ msgstr "Kol."
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1684,7 +1696,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1737,11 +1749,6 @@ msgid "Reference"
msgstr "Sklic"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Sklic ME"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referenčna enota mere"
@@ -1825,7 +1832,7 @@ msgid "Select an Open Sales Order"
msgstr "Izberite odprt nalog za prodajo"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1914,7 +1921,7 @@ msgid "Supplier Features"
msgstr "Lastnosti dobavitelja"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1922,7 +1929,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Računi dobaviteljev"
@@ -1964,7 +1971,7 @@ msgstr ""
"dobaviteljevo ceno za izbrane izdelka/količine."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1974,7 +1981,7 @@ msgstr ""
"napaka."
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1982,7 +1989,7 @@ msgid ""
msgstr "Izbrani dobavitelj ima določeno minimalno količino naročanja %s %s"
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Izbrani dobavitelj prodaja le ta artikel z %s"
@@ -2010,7 +2017,7 @@ msgid "The total amount"
msgstr "Skupni znesek"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2076,13 +2083,13 @@ msgid "Total amount"
msgstr "Skupni znesek"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Tega nabavnega naloga ni mogoče preklicati."
@@ -2103,6 +2110,11 @@ msgid "Unit Price"
msgstr "Cena enote"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Skupine enot mere"
@@ -2166,7 +2178,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Preveril"
@@ -2182,15 +2193,14 @@ msgstr "Čakam dobavitelja"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Skladišče"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2218,7 +2228,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Ne morete potrditi nabavnega naloga brez postavk."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2227,3 +2243,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Sklic vašega naročila"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Sklic ME"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index 7e8efd04ea1..ec800fa1385 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 07:42+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:30+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 523b6b9d618..b1e8ceea3be 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Odredište"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Neto cijena"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr "Redovi naloga"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Proizvod"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Nabavni cenovnik"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Količina"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1947,7 +1954,7 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2058,13 +2065,13 @@ msgid "Total amount"
msgstr "Ukupni iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2083,6 +2090,11 @@ msgid "Unit Price"
msgstr "Jedinična cena"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2146,7 +2158,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Overeno od strane"
@@ -2162,15 +2173,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2198,7 +2208,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index d1aab1ae7bc..46051d6fd8e 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Serbian Latin <sr@latin@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Opis"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Odredište"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Neto cijena"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr "Redovi naloga"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Proizvod"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Nabavni cenovnik"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Količina"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1947,7 +1954,7 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2058,13 +2065,13 @@ msgid "Total amount"
msgstr "Ukupni iznos"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2083,6 +2090,11 @@ msgid "Unit Price"
msgstr "Jedinična cena"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2146,7 +2158,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Overeno od strane"
@@ -2162,15 +2173,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2198,7 +2208,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 3de73c10648..d9401229009 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Swedish <sv@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: 2014-08-15 07:43+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# Rader"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# Rader"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -493,6 +495,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Snittpris"
@@ -550,8 +557,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -579,7 +586,7 @@ msgid "Can be Purchased"
msgstr "Kan köpas"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -600,18 +607,22 @@ msgid "Cancelled"
msgstr "Cancelled"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -641,7 +652,7 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Konfigurationsfel!"
@@ -803,7 +814,6 @@ msgstr "Beskrivning"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Destination"
@@ -838,7 +848,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -864,7 +874,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -894,12 +904,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Momshantering"
@@ -1005,7 +1009,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1042,13 +1046,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1208,6 +1212,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Net Price"
@@ -1218,19 +1227,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Leverantör saknas för denna produkt !"
@@ -1273,7 +1282,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Orderdatum"
@@ -1290,6 +1298,7 @@ msgstr "Order Lines"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1331,7 +1340,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
@@ -1395,6 +1404,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1437,7 +1451,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Product"
@@ -1477,7 +1490,7 @@ msgid "Products by Category"
msgstr "Produkter per kategori"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1587,7 +1600,7 @@ msgid "Purchase Pricelist"
msgstr "Inköpsprislista"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1637,12 +1650,11 @@ msgstr "Qty"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Kvantitet"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1681,7 +1693,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1734,11 +1746,6 @@ msgid "Reference"
msgstr "Reference"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referens UOM"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1822,7 +1829,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1911,7 +1918,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1919,7 +1926,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Leverantörsfakturor"
@@ -1961,7 +1968,7 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1969,7 +1976,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1979,7 +1986,7 @@ msgstr ""
"köpa mindre."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valda leverantören säljer endast denna produkt med %s"
@@ -2007,7 +2014,7 @@ msgid "The total amount"
msgstr "Den totala summan"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2074,13 +2081,13 @@ msgid "Total amount"
msgstr "Totalt belopp"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2099,6 +2106,11 @@ msgid "Unit Price"
msgstr "Unit Price"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2162,7 +2174,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Validerad av"
@@ -2178,15 +2189,14 @@ msgstr "Väntar på Leverantörsbekräftelse"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Lagerhus"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2214,7 +2224,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2224,3 +2240,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Your Order Reference"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referens UOM"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index c8b6c6a8434..4922004fe88 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# ของรายการ"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# ของรายการ"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "ราคาเฉลี่ย"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "ยกเลิกแล้ว"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "หมวดหมู่"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "การกำหนดค่า"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "การตั้งค่าผิดพลาด"
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "ปลายทาง"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "ราคาสุทธิ"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "วันที่สั่งซื้อ"
@@ -1279,6 +1287,7 @@ msgstr "รายการสั่งซื้อ"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "จำนวน"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "เลขที่"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "หน่วยอ้างอิง"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "ใบแจ้งหนี้จากผู้จัดจำหน่าย"
@@ -1947,7 +1954,7 @@ msgstr ""
"และจะคำนวณหาราคาซื้อของคู่ค้าปัจจุบันให้ตรงกับสินค้าและจำนวนที่เลือกไว้"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1955,7 +1962,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1963,7 +1970,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1991,7 +1998,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2056,13 +2063,13 @@ msgid "Total amount"
msgstr "รวมเป็นจำนวนเงิน"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2081,6 +2088,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2144,7 +2156,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "ตรวจสอบแล้ว โดย"
@@ -2160,15 +2171,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2196,7 +2206,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2205,3 +2221,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr ""
+
+#~ msgid "Reference UOM"
+#~ msgstr "หน่วยอ้างอิง"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index fdecf75f0c3..702353d339f 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Klingon <tlh@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr ""
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr ""
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 9f428d7de42..028261309d1 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,91 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Turkish <tr@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" * Satınalma siparişi taslak durumunda olursa 'Taslak' durumu kendiliğinden "
-"taslak olarak ayarlanır. \n"
-"* Satınalma siparişi onaylı durumundaysa 'Onaylı' durumu kendiliğinden "
-"onaylı olarak ayarlanır. \n"
-"* Satınalma siparişi yapıldı olarak ayarlanırsa 'Yapıldı' durumu "
-"kendiliğinden yapıldı olarak ayarlanır. "
-" \n"
-"* Bir kullanıcı satınalma siparişini iptal ettiğinde 'İptal edildi' durumu "
-"kendiliğinden ayarlanır."
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Kalem Sayısı"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "Satınalma Siparişi Sayısı"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Sipariş (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(güncelle)"
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -102,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -136,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -172,6 +101,7 @@ 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"
@@ -182,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -214,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -248,6 +178,78 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" * Satınalma siparişi taslak durumunda olursa 'Taslak' durumu kendiliğinden "
+"taslak olarak ayarlanır. \n"
+"* Satınalma siparişi onaylı durumundaysa 'Onaylı' durumu kendiliğinden "
+"onaylı olarak ayarlanır. \n"
+"* Satınalma siparişi yapıldı olarak ayarlanırsa 'Yapıldı' durumu "
+"kendiliğinden yapıldı olarak ayarlanır. "
+" \n"
+"* Bir kullanıcı satınalma siparişini iptal ettiğinde 'İptal edildi' durumu "
+"kendiliğinden ayarlanır."
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Kalem Sayısı"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "Satınalma Siparişi Sayısı"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Sipariş (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(güncelle)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -526,6 +528,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Ortalama Fiyat"
@@ -583,8 +590,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -612,7 +619,7 @@ msgid "Can be Purchased"
msgstr "Satın Alınabilir"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -633,18 +640,22 @@ msgid "Cancelled"
msgstr "İptal Edildi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -674,7 +685,7 @@ msgid "Configuration"
msgstr "Yapılandırma"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "Yapılandırma Hatası!"
@@ -836,7 +847,6 @@ msgstr "Açıklama"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Hedef Konum"
@@ -871,7 +881,7 @@ msgid "Draft PO"
msgstr "Taslak SS"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "Taslak Satınalma Siparişi oluşturuldu"
@@ -897,7 +907,7 @@ msgstr "Eposta yazma sihirbazı"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "Hata!"
@@ -927,12 +937,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Mali Durumu"
@@ -1038,7 +1042,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "İşlem Geçersiz!"
@@ -1075,13 +1079,13 @@ msgid "Invoice Received"
msgstr "Fatura Kabulu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1244,6 +1248,11 @@ msgid "Messages and communication history"
msgstr "Mesajlar ve iletişim geçmişi"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Net Fiyat"
@@ -1254,19 +1263,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "Tedarikçi için belirlenen adres yok"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "Bu ürün için varsayılan tedarikçi yok"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "Bu Ürün için tanımlı tedarikçi yok !"
@@ -1309,7 +1318,6 @@ msgstr "Satınalma Menüsünü Aç"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Sipariş Tarihi"
@@ -1326,6 +1334,7 @@ msgstr "Sipariş Kalemleri"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1367,7 +1376,7 @@ msgid "Outgoing Mails"
msgstr "Giden Postalar"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "SS: %s"
@@ -1431,6 +1440,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "Satınalma siparişinden oluşturulan taslak faturalardan"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "Fiyat Tipleri"
@@ -1473,7 +1487,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Ürün"
@@ -1513,7 +1526,7 @@ msgid "Products by Category"
msgstr "Ürün Kategorileri"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1623,7 +1636,7 @@ msgid "Purchase Pricelist"
msgstr "Satınalma Fiyat Listesi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1675,12 +1688,11 @@ msgstr "Mik"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Miktar"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1719,7 +1731,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1772,11 +1784,6 @@ msgid "Reference"
msgstr "Referans"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "Referans Ölçü Birimi"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "Referans Ölçü Birimi"
@@ -1862,7 +1869,7 @@ msgid "Select an Open Sales Order"
msgstr "Bir Açık Satış Sipariş Seçin"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1952,7 +1959,7 @@ msgid "Supplier Features"
msgstr "Tedarikçi Özellikleri"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1960,7 +1967,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "Tedarikçi Faturaları"
@@ -2003,7 +2010,7 @@ msgstr ""
"hesaplar."
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -2013,7 +2020,7 @@ msgstr ""
"yapılandırma hatası olarak görünüyor!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2023,7 +2030,7 @@ msgstr ""
"azını satın alamazsınız."
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Seçilen tedarikçi bu ürünü sadece %s olarak satar"
@@ -2051,7 +2058,7 @@ msgid "The total amount"
msgstr "Toplam tutar"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2118,13 +2125,13 @@ msgid "Total amount"
msgstr "Toplam tutar"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Bu satınalma siparişi iptal edilemiyor."
@@ -2145,6 +2152,11 @@ msgid "Unit Price"
msgstr "Birim Fiyat"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Ölçü Birimi Kategorileri"
@@ -2208,7 +2220,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Onaylayan"
@@ -2224,15 +2235,14 @@ msgstr "Tedarikçi Onayı Bekleniyor"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Depo"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2262,7 +2272,13 @@ msgstr ""
"onaylayamazsınız."
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2272,3 +2288,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "Sipariş Referansınız"
+
+#~ msgid "Reference UOM"
+#~ msgstr "Referans Ölçü Birimi"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 33be8e5d96d..59522d7f4fc 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Ukrainian <uk@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr ""
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Скасовано"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Опис"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr ""
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "Внутрішня ціна"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr ""
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Продукт"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "Прейскурант придбання"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "К-сть"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Кількість"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2054,13 +2061,13 @@ msgid "Total amount"
msgstr "Загальна сума"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2079,6 +2086,11 @@ msgid "Unit Price"
msgstr "Ціна одиниці"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2142,7 +2154,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "Затверджено"
@@ -2158,15 +2169,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2194,7 +2204,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 7a1fcc43f58..38de1ee14c2 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr ""
+"X-Launchpad-Export-Date: 2014-09-24 09:31+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "Giá trung bình"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "Đã hủy bỏ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Loại"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "Cấu hình"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -794,7 +805,6 @@ msgstr "Mô tả"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "Điểm đến"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -855,7 +865,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr ""
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr ""
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1262,7 +1271,6 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "Ngày dặt hàng"
@@ -1279,6 +1287,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr ""
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "Sản phẩm"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "Số lượng"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "Số lượng"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "Tham chiếu"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr ""
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr ""
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr ""
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr "Tổng giá trị"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr "Tổng số tiền"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr "Đơn giá"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr ""
@@ -2156,15 +2167,14 @@ msgstr ""
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "Kho hàng"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 63fbfb01673..f5cf3666373 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,86 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-23 08:37+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-09-27 12:06+0000\n"
+"Last-Translator: youring <youring@gmail.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@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: 2014-08-24 07:50+0000\n"
-"X-Generator: Launchpad (build 17163)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-" *当采购单在草稿状态时,自动设置为“草稿”。\n"
-"*当采购单确认为确认状态时,设置为“确认”。\n"
-"*当采购订单完成后,自动设置为“完成”\n"
-"*当用户取消了采购订单后,自动设置为“已经取消”"
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr " 买"
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr "笔采购单"
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr "笔供应商发票"
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "# 明细"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "采购订单号"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} 订单 (编号 ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(更新)"
+"X-Launchpad-Export-Date: 2014-09-28 07:21+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -97,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -131,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -167,6 +101,7 @@ 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"
@@ -177,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -209,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -243,6 +178,73 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+" *当采购单在草稿状态时,自动设置为“草稿”。\n"
+"*当采购单确认为确认状态时,设置为“确认”。\n"
+"*当采购订单完成后,自动设置为“完成”\n"
+"*当用户取消了采购订单后,自动设置为“已经取消”"
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr " 买"
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr "笔采购单"
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr "笔供应商发票"
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# 明细"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "采购订单号"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} 订单 (编号 ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(更新)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -387,6 +389,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" 点击以创建一份发票草稿。\n"
+" </p><p>\n"
+" 此菜单用来控制从供应商那里收到的发票。Odoo会按照你的设置,根据你的采购订单或收货单生成发票草稿。\n"
+" </p><p>\n"
+" 一旦收到了供应商的发票,你可以将它与发票草稿进行对比,从而核准发票草稿。\n"
+" </p>\n"
+" "
#. module: purchase
#: model:ir.actions.act_window,help:purchase.product_normal_action_puchased
@@ -523,6 +533,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "均价"
@@ -580,8 +595,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr "购买"
@@ -609,10 +624,10 @@ msgid "Can be Purchased"
msgstr "可被采购"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
-msgstr ""
+msgstr "无法查找到任何采购途径"
#. module: purchase
#: view:purchase.config.settings:purchase.view_purchase_configuration
@@ -630,18 +645,22 @@ msgid "Cancelled"
msgstr "已取消"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
-msgstr ""
+msgstr "无法删除处于'%s'状态的采购订单行。"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "分类"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -671,7 +690,7 @@ msgid "Configuration"
msgstr "设置"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "设置错误!"
@@ -833,7 +852,6 @@ msgstr "说明"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "目的地"
@@ -868,7 +886,7 @@ msgid "Draft PO"
msgstr "采购订单草稿"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "采购单草稿被创建"
@@ -894,7 +912,7 @@ msgstr "电子邮件撰写向导"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "错误!"
@@ -924,12 +942,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "财务结构"
@@ -1033,7 +1045,7 @@ msgstr "国际商业条款是一系列预定义的用于国际贸易的商业条
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "非法的动作"
@@ -1070,13 +1082,13 @@ msgid "Invoice Received"
msgstr "已收发票"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr "发票已付清"
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr "已收到发票"
@@ -1236,6 +1248,11 @@ msgid "Messages and communication history"
msgstr "消息和通信历史"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "净价"
@@ -1246,19 +1263,19 @@ msgid "New Mail"
msgstr "新邮件"
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "供应商地址未定义"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "产品没定义默认供应商"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "尚未定义这个产品的供应商!"
@@ -1301,7 +1318,6 @@ msgstr "打开采购菜单"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "订单日期"
@@ -1318,6 +1334,7 @@ msgstr "订单明细"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr "订单月份"
@@ -1359,7 +1376,7 @@ msgid "Outgoing Mails"
msgstr "发出邮件"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1423,6 +1440,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "基于采购订单预先生成发票草稿"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "计价基础"
@@ -1465,7 +1487,6 @@ msgstr "产品需求规则"
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "产品"
@@ -1505,7 +1526,7 @@ msgid "Products by Category"
msgstr "产品分类"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr "已接收产品"
@@ -1612,7 +1633,7 @@ msgid "Purchase Pricelist"
msgstr "采购价格表"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr "采购单已创建并已链接到现存的采购单"
@@ -1662,12 +1683,11 @@ msgstr "数量"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr "已在现存采购单明细行上添加数量。"
@@ -1706,7 +1726,7 @@ msgstr "询价单已完成"
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr "询价单已创建"
@@ -1759,11 +1779,6 @@ msgid "Reference"
msgstr "单号"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "计量单位"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "参考计量单位"
@@ -1847,7 +1862,7 @@ msgid "Select an Open Sales Order"
msgstr "选择一个待支付的销售单"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1936,7 +1951,7 @@ msgid "Supplier Features"
msgstr "供应商特征"
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1944,7 +1959,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "供应商发票"
@@ -1984,7 +1999,7 @@ msgid ""
msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1992,7 +2007,7 @@ msgid ""
msgstr "产品 \"%s\" 中,你公司被被定义经销商,这看起来是个配置错误!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2000,7 +2015,7 @@ msgid ""
msgstr "这个选择的供应商有最小数量设置 %s %s , 你不应该购买更少。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "选择的供应商只销售这产品 %s"
@@ -2028,7 +2043,7 @@ msgid "The total amount"
msgstr "总金额"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr "产品 %s 无关联的供应商"
@@ -2091,13 +2106,13 @@ msgid "Total amount"
msgstr "总金额"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr "不能取消采购单 %s"
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "不能取消这个采购订单"
@@ -2116,6 +2131,11 @@ msgid "Unit Price"
msgstr "单价"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "计量单位类别"
@@ -2179,7 +2199,6 @@ msgstr "审核人:"
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "审核人"
@@ -2195,15 +2214,14 @@ msgstr "等该供应商回复"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "仓库"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2231,7 +2249,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "你不能确认没有任何明细的采购订单"
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr "您必须先取消跟此采购单有关的所有发票"
@@ -2240,3 +2264,6 @@ msgstr "您必须先取消跟此采购单有关的所有发票"
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "您的订单"
+
+#~ msgid "Reference UOM"
+#~ msgstr "计量单位"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 1390b6fd707..fd8f2f3fd4c 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -7,82 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese (Traditional) <zh_TW@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: 2014-08-15 07:44+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: purchase
-#: help:purchase.config.settings,module_stock_dropshipping:0
-msgid ""
-"\n"
-"Creates the dropship route and add more complex tests-This installs the "
-"module stock_dropshipping."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid ""
-" * The 'Draft' status is set automatically when purchase order in draft "
-"status. \n"
-"* The 'Confirmed' status is set automatically as confirm when purchase order "
-"in confirm status. \n"
-"* The 'Done' status is set automatically when purchase order is set as done. "
-" \n"
-"* The 'Cancelled' status is set automatically when user cancel purchase "
-"order."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/stock.py:135
-#, python-format
-msgid " Buy"
-msgstr ""
-
-#. module: purchase
-#: field:product.product,purchase_count:0
-#: field:product.template,purchase_count:0
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
-#: field:res.partner,supplier_invoice_count:0
-msgid "# Supplier Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "行數"
-
-#. module: purchase
-#: field:res.partner,purchase_order_count:0
-msgid "# of Purchase Order"
-msgstr "採購訂單總數"
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
-#: model:email.template,subject:purchase.email_template_edi_purchase_done
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} 訂單 (Ref ${object.name or 'n/a' })"
-
-#. module: purchase
-#: view:purchase.order:purchase.purchase_order_form
-msgid "(update)"
-msgstr "(更新)"
+"X-Launchpad-Export-Date: 2014-09-24 09:32+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase_done
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"
@@ -93,28 +31,28 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   Order number: <strong>${object.name}</strong><br>\n"
-"   Order total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br>\n"
-"   Order date: ${object.date_order}<br>\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.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   Order reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -127,30 +65,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -163,6 +101,7 @@ 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"
@@ -173,26 +112,26 @@ msgid ""
"</p>\n"
" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"   <strong>REFERENCES</strong><br>\n"
-"   RFQ number: <strong>${object.name}</strong><br>\n"
-"   RFQ date: ${object.date_order}<br>\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
" % if object.origin:\n"
-"   RFQ reference: ${object.origin}<br>\n"
+" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
" % endif\n"
" % if object.partner_ref:\n"
-"   Your reference: ${object.partner_ref}<br>\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
" % endif\n"
" % if object.validator:\n"
-"   Your contact: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order ${object.name}\">${object.validator.name}</a>\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"
+" <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"
+" <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"
@@ -205,30 +144,30 @@ msgid ""
"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"
+" ${object.company_id.street}<br/>\n"
" % endif\n"
" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br>\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"
+" ${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"
+"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:  ${object.company_id.phone}\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
" </div>\n"
" % endif\n"
" % if object.company_id.website:\n"
" <div>\n"
-" Web : <a "
+" Web :&nbsp;<a "
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
" %endif\n"
@@ -239,6 +178,69 @@ msgid ""
msgstr ""
#. module: purchase
+#: help:purchase.config.settings,module_stock_dropshipping:0
+msgid ""
+"\n"
+"Creates the dropship route and add more complex tests-This installs the "
+"module stock_dropshipping."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status. \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status. \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+" \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:185
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase
+#: field:product.product,purchase_count:0
+#: field:product.template,purchase_count:0
+msgid "# Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,supplier_invoice_count:0
+msgid "# Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "行數"
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr "採購訂單總數"
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase_done
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} 訂單 (Ref ${object.name or 'n/a' })"
+
+#. module: purchase
+#: view:purchase.order:purchase.purchase_order_form
+msgid "(update)"
+msgstr "(更新)"
+
+#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -484,6 +486,11 @@ msgid "Associated procurements"
msgstr ""
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
+msgid "Average Delivery Time"
+msgstr ""
+
+#. module: purchase
#: field:purchase.report,price_average:0
msgid "Average Price"
msgstr "平均價格"
@@ -541,8 +548,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1157
-#: code:addons/purchase/stock.py:129
+#: code:addons/purchase/purchase.py:1160
+#: code:addons/purchase/stock.py:179
#, python-format
msgid "Buy"
msgstr ""
@@ -570,7 +577,7 @@ msgid "Can be Purchased"
msgstr "可採購"
#. module: purchase
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -591,18 +598,22 @@ msgid "Cancelled"
msgstr "已取消"
#. module: purchase
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "分類"
#. module: purchase
+#: view:purchase.report:purchase.view_purchase_order_search
+msgid "Category of product"
+msgstr ""
+
+#. module: purchase
#: field:purchase.config.settings,group_advance_purchase_requisition:0
msgid "Choose from several bids in a call for bids"
msgstr ""
@@ -632,7 +643,7 @@ msgid "Configuration"
msgstr "設定"
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid "Configuration Error!"
msgstr "設定錯誤!"
@@ -794,7 +805,6 @@ msgstr "說明"
#. module: purchase
#: field:purchase.order,location_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,location_id:0
msgid "Destination"
msgstr "目的地"
@@ -829,7 +839,7 @@ msgid "Draft PO"
msgstr "採購訂單草稿"
#. module: purchase
-#: code:addons/purchase/purchase.py:1363
+#: code:addons/purchase/purchase.py:1366
#, python-format
msgid "Draft Purchase Order created"
msgstr "採購訂單草稿已建立"
@@ -855,7 +865,7 @@ msgstr "電子郵件撰寫精靈"
#: code:addons/purchase/purchase.py:529
#: code:addons/purchase/purchase.py:546
#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:132
+#: code:addons/purchase/stock.py:182
#, python-format
msgid "Error!"
msgstr "錯誤!"
@@ -885,12 +895,6 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:681
-#, python-format
-msgid "First cancel all receipts related to this purchase order."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "財務結構"
@@ -994,7 +998,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1005
+#: code:addons/purchase/purchase.py:1007
#, python-format
msgid "Invalid Action!"
msgstr "無效的動作"
@@ -1031,13 +1035,13 @@ msgid "Invoice Received"
msgstr "發票已收"
#. module: purchase
-#: code:addons/purchase/purchase.py:1479
+#: code:addons/purchase/purchase.py:1482
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1459
+#: code:addons/purchase/purchase.py:1462
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1197,6 +1201,11 @@ msgid "Messages and communication history"
msgstr "訊息及聯絡歷史"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
+msgid "Monthly Purchases"
+msgstr ""
+
+#. module: purchase
#: view:website:purchase.report_purchaseorder
msgid "Net Price"
msgstr "淨價"
@@ -1207,19 +1216,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1202
+#: code:addons/purchase/purchase.py:1205
#, python-format
msgid "No address defined for the supplier"
msgstr "該供應商無地址"
#. module: purchase
-#: code:addons/purchase/purchase.py:1200
+#: code:addons/purchase/purchase.py:1203
#, python-format
msgid "No default supplier defined for this product"
msgstr "此產品無預設供應商"
#. module: purchase
-#: code:addons/purchase/purchase.py:1198
+#: code:addons/purchase/purchase.py:1201
#, python-format
msgid "No supplier defined for this product !"
msgstr "此產品無定義供應商"
@@ -1262,7 +1271,6 @@ msgstr "開啟採購功能選單"
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,date_order:0
#: field:purchase.order.line,date_order:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,date:0
msgid "Order Date"
msgstr "訂單日期"
@@ -1279,6 +1287,7 @@ msgstr "訂單行"
#. module: purchase
#: view:purchase.order:purchase.view_purchase_order_filter
+#: view:purchase.report:purchase.view_purchase_order_search
msgid "Order Month"
msgstr ""
@@ -1320,7 +1329,7 @@ msgid "Outgoing Mails"
msgstr "寄出郵件"
#. module: purchase
-#: code:addons/purchase/purchase.py:1343
+#: code:addons/purchase/purchase.py:1346
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1384,6 +1393,11 @@ msgid "Pre-generate draft invoices based on purchase orders"
msgstr "基於採購單預先產生之發票草稿"
#. module: purchase
+#: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier
+msgid "Price Per Supplier"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
msgstr "價格類別"
@@ -1426,7 +1440,6 @@ msgstr ""
#: field:purchase.order,product_id:0
#: view:purchase.order.line:purchase.purchase_order_line_search
#: field:purchase.order.line,product_id:0
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,product_id:0
msgid "Product"
msgstr "產品"
@@ -1466,7 +1479,7 @@ msgid "Products by Category"
msgstr "各分類產品"
#. module: purchase
-#: code:addons/purchase/purchase.py:840
+#: code:addons/purchase/purchase.py:842
#, python-format
msgid "Products received"
msgstr ""
@@ -1573,7 +1586,7 @@ msgid "Purchase Pricelist"
msgstr "採購價目表"
#. module: purchase
-#: code:addons/purchase/purchase.py:1365
+#: code:addons/purchase/purchase.py:1368
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1623,12 +1636,11 @@ msgstr "數量"
#. module: purchase
#: field:purchase.order.line,product_qty:0
-#: field:purchase.report,quantity:0
msgid "Quantity"
msgstr "數量"
#. module: purchase
-#: code:addons/purchase/purchase.py:1367
+#: code:addons/purchase/purchase.py:1370
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1667,7 +1679,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:934
+#: code:addons/purchase/purchase.py:936
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1720,11 +1732,6 @@ msgid "Reference"
msgstr "參照"
#. module: purchase
-#: view:purchase.report:purchase.view_purchase_order_search
-msgid "Reference UOM"
-msgstr "參照度量單位"
-
-#. module: purchase
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
msgstr "參照度量單位"
@@ -1808,7 +1815,7 @@ msgid "Select an Open Sales Order"
msgstr "選擇一張待付銷售訂單"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
+#: code:addons/purchase/purchase.py:1104
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1897,7 +1904,7 @@ msgid "Supplier Features"
msgstr ""
#. module: purchase
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
msgid "Supplier Inv."
msgstr ""
@@ -1905,7 +1912,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:435
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
-#: view:res.partner:purchase.res_partner_view_purchase_buttons
+#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
#, python-format
msgid "Supplier Invoices"
msgstr "供應商發票"
@@ -1945,7 +1952,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1211
+#: code:addons/purchase/purchase.py:1214
#, python-format
msgid ""
"The product \"%s\" has been defined with your company as reseller which "
@@ -1953,7 +1960,7 @@ msgid ""
msgstr "您的公司被定義為產品「%s」的經銷商。這似乎是設定錯誤!"
#. module: purchase
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1123
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -1961,7 +1968,7 @@ msgid ""
msgstr "所選供應廠商有設定最小出貨量 %s %s,您不應購買少於此量。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1117
+#: code:addons/purchase/purchase.py:1119
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "所選供應商僅以 %s 銷售此產品"
@@ -1989,7 +1996,7 @@ msgid "The total amount"
msgstr "總金額"
#. module: purchase
-#: code:addons/purchase/purchase.py:1315
+#: code:addons/purchase/purchase.py:1318
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -2052,13 +2059,13 @@ msgid "Total amount"
msgstr "總金額"
#. module: purchase
-#: code:addons/purchase/purchase.py:680
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:687
+#: code:addons/purchase/purchase.py:691
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "無法取消此採購訂單"
@@ -2077,6 +2084,11 @@ msgid "Unit Price"
msgstr "單價"
#. module: purchase
+#: field:purchase.report,quantity:0
+msgid "Unit Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "度量單位類別"
@@ -2140,7 +2152,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,validator:0
-#: view:purchase.report:purchase.view_purchase_order_search
msgid "Validated by"
msgstr "驗證"
@@ -2156,15 +2167,14 @@ msgstr "等待供應商確認中"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_warehouse
-#: view:purchase.report:purchase.view_purchase_order_search
#: field:purchase.report,picking_type_id:0
msgid "Warehouse"
msgstr "倉庫"
#. module: purchase
-#: code:addons/purchase/purchase.py:1102
-#: code:addons/purchase/purchase.py:1117
-#: code:addons/purchase/purchase.py:1121
+#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1123
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2192,7 +2202,13 @@ msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "無採購訂單明細之採購訂單無法被確認。"
#. module: purchase
-#: code:addons/purchase/purchase.py:688
+#: code:addons/purchase/purchase.py:686
+#, python-format
+msgid "You have already received some goods for it. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:692
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
@@ -2201,3 +2217,6 @@ msgstr ""
#: view:website:purchase.report_purchaseorder
msgid "Your Order Reference"
msgstr "貴方採購編號"
+
+#~ msgid "Reference UOM"
+#~ msgstr "參照度量單位"