summaryrefslogtreecommitdiff
path: root/addons/purchase/i18n
diff options
context:
space:
mode:
authorLaunchpad Translations on behalf of openerp <>2012-12-04 05:59:56 +0000
committerLaunchpad Translations on behalf of openerp <>2012-12-04 05:59:56 +0000
commit683f31e51b23bce96dbd0e43ef8d66baaba6f4c9 (patch)
tree928b4428c7522d3943dd0413f29d8af39b20ac98 /addons/purchase/i18n
parent2be8fdd0301f1d7178ebd96fe7e00f10b751c4bd (diff)
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
Diffstat (limited to 'addons/purchase/i18n')
-rw-r--r--addons/purchase/i18n/ar.po396
-rw-r--r--addons/purchase/i18n/bg.po385
-rw-r--r--addons/purchase/i18n/bs.po375
-rw-r--r--addons/purchase/i18n/ca.po387
-rw-r--r--addons/purchase/i18n/cs.po387
-rw-r--r--addons/purchase/i18n/da.po375
-rw-r--r--addons/purchase/i18n/de.po396
-rw-r--r--addons/purchase/i18n/el.po375
-rw-r--r--addons/purchase/i18n/en_GB.po393
-rw-r--r--addons/purchase/i18n/es.po396
-rw-r--r--addons/purchase/i18n/es_AR.po375
-rw-r--r--addons/purchase/i18n/es_CL.po387
-rw-r--r--addons/purchase/i18n/es_CR.po394
-rw-r--r--addons/purchase/i18n/es_EC.po396
-rw-r--r--addons/purchase/i18n/et.po375
-rw-r--r--addons/purchase/i18n/fi.po396
-rw-r--r--addons/purchase/i18n/fr.po398
-rw-r--r--addons/purchase/i18n/gl.po373
-rw-r--r--addons/purchase/i18n/hr.po391
-rw-r--r--addons/purchase/i18n/hu.po387
-rw-r--r--addons/purchase/i18n/id.po381
-rw-r--r--addons/purchase/i18n/it.po387
-rw-r--r--addons/purchase/i18n/ja.po396
-rw-r--r--addons/purchase/i18n/ko.po375
-rw-r--r--addons/purchase/i18n/lt.po375
-rw-r--r--addons/purchase/i18n/lv.po387
-rw-r--r--addons/purchase/i18n/mn.po396
-rw-r--r--addons/purchase/i18n/nb.po396
-rw-r--r--addons/purchase/i18n/nl.po403
-rw-r--r--addons/purchase/i18n/nl_BE.po396
-rw-r--r--addons/purchase/i18n/pl.po396
-rw-r--r--addons/purchase/i18n/pt.po396
-rw-r--r--addons/purchase/i18n/pt_BR.po394
-rw-r--r--addons/purchase/i18n/ro.po396
-rw-r--r--addons/purchase/i18n/ru.po398
-rw-r--r--addons/purchase/i18n/sk.po373
-rw-r--r--addons/purchase/i18n/sl.po387
-rw-r--r--addons/purchase/i18n/sq.po373
-rw-r--r--addons/purchase/i18n/sr.po375
-rw-r--r--addons/purchase/i18n/sr@latin.po375
-rw-r--r--addons/purchase/i18n/sv.po396
-rw-r--r--addons/purchase/i18n/th.po381
-rw-r--r--addons/purchase/i18n/tlh.po373
-rw-r--r--addons/purchase/i18n/tr.po396
-rw-r--r--addons/purchase/i18n/uk.po375
-rw-r--r--addons/purchase/i18n/vi.po378
-rw-r--r--addons/purchase/i18n/zh_CN.po481
-rw-r--r--addons/purchase/i18n/zh_TW.po375
48 files changed, 8056 insertions, 10591 deletions
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index c0b59cf3eaa..db6adc807b6 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-08 16:00+0000\n"
"Last-Translator: kifcaliph <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "قائمة اسعار الشراء الافتراضية"
@@ -143,6 +60,11 @@ msgstr ""
"للمنتجات المختارة/الكميات."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "يجب عليك أولا إلغاء جميع حفلات الاستقبال المتعلقة بهذا أمر الشراء."
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "متوسط السعر"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -310,15 +232,15 @@ msgid ""
msgstr "تم حسابها كأدنى حد للتاريخ المجدول لكل منتجات خطوط امر الشراء."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "أمر شراء مؤكد لعمل فاتورة"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -352,7 +274,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -421,17 +343,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "أكتوبر"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -447,12 +364,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "تم تجميع القائمة المختارة لمتابعة المنتجات الوارده."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "المرجع يجب أن يكون فريداً لكل شركة علي حدا!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -473,7 +384,7 @@ msgid "Quantity"
msgstr "كمية"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -536,7 +447,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -567,13 +478,6 @@ msgid "Journal"
msgstr "اليومية"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -590,11 +494,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "اسم الشركة يجب أن يكون فريداً !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -618,11 +517,6 @@ msgid "Purchase Lead Time"
msgstr "وقت مهام الشراء"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -676,7 +570,7 @@ msgid "Supplier"
msgstr "مورِّد"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -769,8 +663,8 @@ msgid "It indicates that a picking has been done"
msgstr "توضح انه قد تم عمل الاختيار"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -790,10 +684,9 @@ msgstr ""
"التسليمات للمورد الخاص بك."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "المخزن"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "طباعة"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -898,7 +791,7 @@ msgid "Stock Moves"
msgstr "حركات الأسهم"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -909,11 +802,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "وهي توضح انه قد تم دفع الفاتورة"
@@ -1012,11 +900,6 @@ msgid "Qty"
msgstr "الكمية"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1066,7 +949,7 @@ msgid "Date Approved"
msgstr "تاريخ الموافقة"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1077,11 +960,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1107,11 +985,11 @@ msgstr ""
"ويؤكدها. وتصبح الحصة المطلوبة امر شراء مؤكد."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1120,12 +998,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1137,7 +1020,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1156,7 +1039,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1167,7 +1050,7 @@ msgid "Purchase Dashboard"
msgstr "لوحة قيادة الشراء"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1216,11 +1099,6 @@ msgid "Set to Draft"
msgstr "حفظ كمسودة"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "ملاحظات"
@@ -1250,7 +1128,7 @@ msgid "Stock Move"
msgstr "حركة مخزن"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1352,7 +1230,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1442,18 +1320,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "يقوم خط امر الشراء بعمل الفاتورة"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "المنتجات الصادرة للفاتورة"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1538,9 +1416,9 @@ msgid "Invoice"
msgstr "فاتورة"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "أمر شراء مؤكد لعمل فاتورة"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1620,7 +1498,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1672,11 +1550,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "لتحكم في الفاتورة"
@@ -1738,6 +1611,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1806,10 +1684,10 @@ msgid "Purchase Order"
msgstr "أمر الشراء"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1853,7 +1731,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1869,13 +1747,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "السعر الصافي"
@@ -1899,11 +1770,6 @@ msgid "Based on receptions"
msgstr "استناداً على ما تم استقباله"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "مرجع المورد"
@@ -1940,11 +1806,6 @@ msgid "Invoice Lines"
msgstr "سطور الفاتورة"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1960,7 +1821,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "يقوم بالبيع لهذا المنتج المود المختار فقط بواسطة %s"
@@ -1981,11 +1842,11 @@ msgid "Configuration"
msgstr "إعدادات"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2001,6 +1862,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "المنتجات الصادرة للفاتورة"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2105,11 +1971,6 @@ msgid "January"
msgstr "يناير"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2147,6 +2008,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "الأوامر الكلية للمستخدم عن كل شهر"
@@ -2157,6 +2101,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "المخزن"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2165,7 +2115,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2256,11 +2206,6 @@ msgid "Pricelist Versions"
msgstr "اصدارات قائمة الاسعار"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2319,12 +2264,12 @@ msgstr "الطلبيّات"
#~ msgid "Order Line"
#~ msgstr "سطر الأمر"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+
#~ msgid "State"
#~ msgstr "الحالة"
-#~ msgid "Print"
-#~ msgstr "طباعة"
-
#, python-format
#~ msgid "Error !"
#~ msgstr "خطأ !"
@@ -2780,18 +2725,27 @@ msgstr "الطلبيّات"
#~ msgid "Month-1"
#~ msgstr "شهر- ١"
+#~ msgid "The company name must be unique !"
+#~ msgstr "اسم الشركة يجب أن يكون فريداً !"
+
#~ msgid "res_config_contents"
#~ msgstr "res_config_contents"
#~ msgid "Back Orders"
#~ msgstr "اوامر العودة"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
+
#~ msgid "To Invoice"
#~ msgstr "في انتظار الفوترة"
#~ msgid "You can not move products from or to a location of the type view."
#~ msgstr "لا يمكنك نقل المنتجات أو المكان من المستعرض."
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "المرجع يجب أن يكون فريداً لكل شركة علي حدا!"
+
#, python-format
#~ msgid "In order to delete a purchase order, it must be cancelled first!"
#~ msgstr "من أجل حذف أمر الشراء، يجب الإلغاء أولاً!"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 601fa66aa35..bb7c13b1de4 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:53+0000\n"
"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Ценова листа при покупка (по подрабиране)"
@@ -143,6 +60,11 @@ msgstr ""
"изчислява доставната цена за избраните продукти / количества."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Средна цена"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -310,15 +232,15 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Потвърдени поръчки към фактури"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -352,7 +274,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -418,17 +340,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Октомври"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -444,12 +361,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -470,7 +381,7 @@ msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -533,7 +444,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -564,13 +475,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -587,11 +491,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -615,11 +514,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -671,7 +565,7 @@ msgid "Supplier"
msgstr "Доставчик"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -764,8 +658,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -783,10 +677,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Печат"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -891,7 +784,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -902,11 +795,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Индикация за платена фактура"
@@ -1005,11 +893,6 @@ msgid "Qty"
msgstr "К-во"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1059,7 +942,7 @@ msgid "Date Approved"
msgstr "Одобрен на дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1070,11 +953,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1098,11 +976,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1111,12 +989,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1128,7 +1011,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1147,7 +1030,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1158,7 +1041,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1207,11 +1090,6 @@ msgid "Set to Draft"
msgstr "Пращане в проект"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Бележки"
@@ -1241,7 +1119,7 @@ msgid "Stock Move"
msgstr "Движение в склад"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1340,7 +1218,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1430,18 +1308,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1526,9 +1404,9 @@ msgid "Invoice"
msgstr "Фактура"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Потвърдени поръчки към фактури"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1608,7 +1486,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1660,11 +1538,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1726,6 +1599,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1795,10 +1673,10 @@ msgid "Purchase Order"
msgstr "Поръчка за покупка"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1840,7 +1718,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1856,13 +1734,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Нетна цена"
@@ -1886,11 +1757,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Препратка към доставчик"
@@ -1925,11 +1791,6 @@ msgid "Invoice Lines"
msgstr "Редове на фактурата"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1943,7 +1804,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1964,11 +1825,11 @@ msgid "Configuration"
msgstr "Настройка"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1984,6 +1845,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2088,11 +1954,6 @@ msgid "January"
msgstr "Януари"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2130,6 +1991,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Общо поръчки по клиент за месец"
@@ -2140,6 +2084,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2148,7 +2098,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2232,11 +2182,6 @@ msgid "Pricelist Versions"
msgstr "Версии на ценова листа"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2400,12 +2345,12 @@ msgstr ""
#~ msgid "Wrong Product UOM !"
#~ msgstr "Грешни мерни единици"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
+
#~ msgid "State"
#~ msgstr "Област"
-#~ msgid "Print"
-#~ msgstr "Печат"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Няма партньор"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 6e5908a6a85..418f915a6bf 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:22+0000\n"
"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standardni nabavni cijenik"
@@ -143,6 +60,11 @@ msgstr ""
"izračunava nabavnu cijenu za odabrane proizvode i količinu."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,14 +234,14 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -420,17 +342,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -446,12 +363,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -472,7 +383,7 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -535,7 +446,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -566,13 +477,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -589,11 +493,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -617,11 +516,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -671,7 +565,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -764,8 +658,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -783,10 +677,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -891,7 +784,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -902,11 +795,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1005,11 +893,6 @@ msgid "Qty"
msgstr "Količina"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1059,7 +942,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1070,11 +953,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1098,11 +976,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1111,12 +989,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1128,7 +1011,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1147,7 +1030,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1158,7 +1041,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1207,11 +1090,6 @@ msgid "Set to Draft"
msgstr "podesi kao draft"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1241,7 +1119,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1340,7 +1218,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1430,18 +1308,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1526,8 +1404,8 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1608,7 +1486,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1660,11 +1538,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Kontrola fakturisanja"
@@ -1726,6 +1599,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1795,10 +1673,10 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1840,7 +1718,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1856,13 +1734,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Neto cijena"
@@ -1886,11 +1757,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1925,11 +1791,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1943,7 +1804,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1964,11 +1825,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1984,6 +1845,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2088,11 +1954,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2130,6 +1991,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2140,6 +2084,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2148,7 +2098,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2232,11 +2182,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 6149e040dca..d771625cf1b 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:44+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra per defecte"
@@ -143,6 +60,11 @@ msgstr ""
"el preu del proveïdor pels productes/quantitats seleccionats."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Preu mitjà"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"les línies de la comanda de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Comanda de compra confirmada per facturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -423,17 +345,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -449,12 +366,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Es genera un albarà per al seguiment dels productes entrants."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -475,7 +386,7 @@ msgid "Quantity"
msgstr "Quantitat"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -538,7 +449,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -569,13 +480,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -592,11 +496,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -620,11 +519,6 @@ msgid "Purchase Lead Time"
msgstr "Termini de temps de compra"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Proveïdor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarà ha estat realitzat."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"de la vostra companyia i el rendiment dels lliuraments del vostre proveïdor."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magatzem"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimeix"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr "Moviments d'estoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que una factura s'ha pagat."
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Qtat"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr "Data aprovació"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1112,11 +990,11 @@ msgstr ""
"pressupost es converteix en una comanda de compra confirmada."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Taulell de compres"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Canvia a esborrany"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Moviment d'estoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1448,18 +1326,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línia comanda de compra realitza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productes sortints a facturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1544,9 +1422,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Comanda de compra confirmada per facturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1626,7 +1504,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1678,11 +1556,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Mètode facturació"
@@ -1744,6 +1617,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1813,10 +1691,10 @@ msgid "Purchase Order"
msgstr "Comanda de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1860,7 +1738,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1876,13 +1754,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Preu net"
@@ -1906,11 +1777,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! No podeu crear companyies recursives."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referència proveïdor"
@@ -1948,11 +1814,6 @@ msgid "Invoice Lines"
msgstr "Línies de factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1970,7 +1831,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveïdor seleccionat només ven aquest producte per %s"
@@ -1991,11 +1852,11 @@ msgid "Configuration"
msgstr "Configuració"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2011,6 +1872,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productes sortints a facturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2115,11 +1981,6 @@ msgid "January"
msgstr "Gener"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2157,6 +2018,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total comandes per usuari mensual"
@@ -2167,6 +2111,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magatzem"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2175,7 +2125,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2271,11 +2221,6 @@ msgid "Pricelist Versions"
msgstr "Versions de llista de preus"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2741,9 +2686,6 @@ msgstr "Comandes"
#~ msgid "State"
#~ msgstr "Estat"
-#~ msgid "Print"
-#~ msgstr "Imprimeix"
-
#~ msgid "Address Contact Name"
#~ msgstr "Nom contacta adreça"
@@ -3027,3 +2969,6 @@ msgstr "Comandes"
#~ msgstr ""
#~ "Número únic de la comanda de compra, calculat de forma automàtica quan la "
#~ "comanda de compra es crea."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! No podeu crear companyies recursives."
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 5d3376ba4a2..0a7dd310fb2 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:54+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
"X-Poedit-Language: Czech\n"
#. module: purchase
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Výchozí nákupní ceník"
@@ -144,6 +61,11 @@ msgstr ""
"dodavatele pro vybrané výrobky/množství."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Průměrná cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"prodejní objednávky."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Potvrzená nákupní objednávka k fakturaci"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -421,17 +343,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Říjen"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -447,12 +364,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Naváděcí seznam vygenerován pro sledování příchozích výrobků."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -473,7 +384,7 @@ msgid "Quantity"
msgstr "Množství"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -536,7 +447,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -567,13 +478,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -590,11 +494,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -618,11 +517,6 @@ msgid "Purchase Lead Time"
msgstr "Čekací čas nákupu"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -677,7 +571,7 @@ msgid "Supplier"
msgstr "Dodavatel"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -770,8 +664,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indikuje, že navádění bylo dokončeno"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -791,10 +685,9 @@ msgstr ""
"obejdnávek vaší společnost a výkonnost doručování vašich dodavatelů."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Sklad"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Tisk"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -899,7 +792,7 @@ msgid "Stock Moves"
msgstr "Skladové pohyby"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -910,11 +803,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indikuje, že faktura již byla zaplacena."
@@ -1013,11 +901,6 @@ msgid "Qty"
msgstr "Množ."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1067,7 +950,7 @@ msgid "Date Approved"
msgstr "Datum schválení"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1078,11 +961,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1108,11 +986,11 @@ msgstr ""
"dodavatel výrobku. RFQ se stane potvrzenou nákupní objednávkou."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1121,12 +999,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1138,7 +1021,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1157,7 +1040,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1168,7 +1051,7 @@ msgid "Purchase Dashboard"
msgstr "Nástěnka nákupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1217,11 +1100,6 @@ msgid "Set to Draft"
msgstr "Nastavit na koncept"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Poznámky"
@@ -1251,7 +1129,7 @@ msgid "Stock Move"
msgstr "Přesun zásob"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1350,7 +1228,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1440,18 +1318,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Řádek nákupní objednávky vytváří fakturu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Odchozí výrobky k fakturaci"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1536,9 +1414,9 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Potvrzená nákupní objednávka k fakturaci"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1618,7 +1496,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1670,11 +1548,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Řízení fakturace"
@@ -1736,6 +1609,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1804,10 +1682,10 @@ msgid "Purchase Order"
msgstr "Nákupní příkaz"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1849,7 +1727,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1865,13 +1743,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Čista cena"
@@ -1895,11 +1766,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Odkaz dodavatele"
@@ -1934,11 +1800,6 @@ msgid "Invoice Lines"
msgstr "Řádky faktury"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1955,7 +1816,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -1976,11 +1837,11 @@ msgid "Configuration"
msgstr "Nastavení"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1996,6 +1857,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Odchozí výrobky k fakturaci"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2100,11 +1966,6 @@ msgid "January"
msgstr "Leden"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2142,6 +2003,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Celkem objednávek podle uživatele podle měsíce"
@@ -2152,6 +2096,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Sklad"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2160,7 +2110,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2244,11 +2194,6 @@ msgid "Pricelist Versions"
msgstr "Verze ceníku"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2403,12 +2348,12 @@ msgstr "Objednávky"
#~ msgid "Wrong Product UOM !"
#~ msgstr "Nesprávná MJ výrobku !"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti."
+
#~ msgid "State"
#~ msgstr "Stav"
-#~ msgid "Print"
-#~ msgstr "Tisk"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Žádný partner!"
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 3d8f3bff2cb..75c16de1fa0 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-08 22:35+0000\n"
"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -142,6 +59,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr "Antal"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr "Leverandør"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,10 +674,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lagersted"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr "Lagerflytning"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr "Antal"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr "Godkendelsesdato"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr "Indkøb oversigt"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Noter"
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr "Lager flytning"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr "Indkøbsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Netto pris"
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr "Januar"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lagersted"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index e70477310f1..86e00061cda 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-02-08 11:47+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standard Einkaufspreisliste"
@@ -144,6 +61,11 @@ msgstr ""
"unter Berücksichtigung der Bestellmenge errechnet."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Sie müssen vorab alle Warenineingänge dieses Auftrags stornieren."
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Durchschnittspreis"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"Anlieferung."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Abzurechnende Beschaffungsaufträge"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -425,17 +347,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -453,12 +370,6 @@ msgstr ""
"Wareneingänge genutzt."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Die Referenz muss je Firma eindeutig sein"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -479,7 +390,7 @@ msgid "Quantity"
msgstr "Menge"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -542,7 +453,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -573,13 +484,6 @@ msgid "Journal"
msgstr "Journal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -596,11 +500,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Einkaufsäufträge mit nicht fakturierten Positionen"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Der Name der Firma darf nur einmal vorkommen!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -624,11 +523,6 @@ msgid "Purchase Lead Time"
msgstr "Durchschnittliche Lieferzeit"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -685,7 +579,7 @@ msgid "Supplier"
msgstr "Lieferant"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -778,8 +672,8 @@ msgid "It indicates that a picking has been done"
msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -800,10 +694,9 @@ msgstr ""
"Liefertreue von Lieferanten."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Zentrallager"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Druck"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -908,7 +801,7 @@ msgid "Stock Moves"
msgstr "Lagerbuchungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -919,11 +812,6 @@ msgid "Product Categories"
msgstr "Produkt Kategorien"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Zeigt an, ob eine Rechnung bereits bezahlt wurde"
@@ -1022,11 +910,6 @@ msgid "Qty"
msgstr "Anz."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1076,7 +959,7 @@ msgid "Date Approved"
msgstr "Datum Annahme"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1087,11 +970,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Aufträge des Jahres"
@@ -1119,11 +997,11 @@ msgstr ""
"Angebotsanfrage zu einem Beschaffungsauftrag / Bestellung."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1132,12 +1010,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1149,7 +1032,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1168,7 +1051,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1179,7 +1062,7 @@ msgid "Purchase Dashboard"
msgstr "Pinnwand Einkauf"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1228,11 +1111,6 @@ msgid "Set to Draft"
msgstr "Setze auf Entwurf"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Bemerkungen"
@@ -1262,7 +1140,7 @@ msgid "Stock Move"
msgstr "Lieferung"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1365,7 +1243,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1457,18 +1335,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Rechnungserstellung für Auftragsposition"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "EA: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Abzurechnender Warenausgang"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1553,9 +1431,9 @@ msgid "Invoice"
msgstr "Rechnung"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Abzurechnende Beschaffungsaufträge"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1635,7 +1513,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1687,11 +1565,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Rechnungserstellung"
@@ -1753,6 +1626,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1822,10 +1700,10 @@ msgid "Purchase Order"
msgstr "Beschaffungsauftrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1870,7 +1748,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1886,13 +1764,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Preis Netto"
@@ -1916,11 +1787,6 @@ msgid "Based on receptions"
msgstr "Basierend auf Wareneingängen"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referenz Lieferant"
@@ -1958,11 +1824,6 @@ msgid "Invoice Lines"
msgstr "Rechnungszeilen"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1979,7 +1840,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -2001,11 +1862,11 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2021,6 +1882,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Abzurechnender Warenausgang"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2125,11 +1991,6 @@ msgid "January"
msgstr "Januar"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2167,6 +2028,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Gesamte Aufträge nach Benutzer pro Monat"
@@ -2177,6 +2121,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Zentrallager"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2185,7 +2135,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2283,11 +2233,6 @@ msgid "Pricelist Versions"
msgstr "Preislisten Versionen"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Einkaufsaufträge im Entwurf"
@@ -2687,9 +2632,6 @@ msgstr "Aufträge"
#~ msgid "State"
#~ msgstr "Status"
-#~ msgid "Print"
-#~ msgstr "Druck"
-
#~ msgid "Address Contact Name"
#~ msgstr "Partner Kontakt Name"
@@ -2897,6 +2839,9 @@ msgstr "Aufträge"
#~ msgstr ""
#~ "Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+
#~ msgid "Configure Your Purchases Management Application"
#~ msgstr "Konfigurieren Sie Ihre Anwendung für den Einkauf"
@@ -3129,6 +3074,9 @@ msgstr "Aufträge"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Basierend auf Auftragspositionen"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Der Name der Firma darf nur einmal vorkommen!"
+
#~ msgid "Is a Back Order"
#~ msgstr "Ist Auftragsrückstand"
@@ -3136,6 +3084,9 @@ msgstr "Aufträge"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Kann diesen Einkaufsauftrag nicht stornieren"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Die Referenz muss je Firma eindeutig sein"
+
#~ msgid "Purchase orders which are not approved yet."
#~ msgstr "Nicht bestätigte Einkaufsaufträge"
@@ -3301,6 +3252,9 @@ msgstr "Aufträge"
#~ msgid "Back Orders"
#~ msgstr "Auftragsrückstand"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
+
#~ msgid "Product UOM"
#~ msgstr "ME"
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 7639f0aaee9..3d80a149762 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 18:22+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -44,89 +44,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Προεπιλεγμένος Τιμοκατάλογος Αγορών"
@@ -147,6 +64,11 @@ msgstr ""
"προϊόντα/ποσότητες."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -187,16 +109,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -239,7 +161,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -316,14 +238,14 @@ msgstr ""
"γραμμές παραγγελίας."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -358,7 +280,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Ποσότητα"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -675,7 +569,7 @@ msgid "Supplier"
msgstr "Προμηθευτής"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -768,8 +662,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -787,10 +681,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Αποθήκη"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -895,7 +788,7 @@ msgid "Stock Moves"
msgstr "Κινήσεις Αποθέματος"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -906,11 +799,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1009,11 +897,6 @@ msgid "Qty"
msgstr "Ποσ."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1063,7 +946,7 @@ msgid "Date Approved"
msgstr "Ημερ/νία Έγκρισης"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1074,11 +957,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1102,11 +980,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1115,12 +993,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1132,7 +1015,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1151,7 +1034,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1162,7 +1045,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1211,11 +1094,6 @@ msgid "Set to Draft"
msgstr "Ορισμός σε Πρόχειρη"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Σημειώσεις"
@@ -1245,7 +1123,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1344,7 +1222,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1434,18 +1312,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1530,8 +1408,8 @@ msgid "Invoice"
msgstr "Τιμολόγιο"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1612,7 +1490,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1664,11 +1542,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Έλεγχος Τιμολογήσεων"
@@ -1730,6 +1603,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1799,10 +1677,10 @@ msgid "Purchase Order"
msgstr "Παραγγελία Αγοράς"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1844,7 +1722,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1860,13 +1738,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Καθαρή Τιμή"
@@ -1890,11 +1761,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1929,11 +1795,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1947,7 +1808,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1968,11 +1829,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1988,6 +1849,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2092,11 +1958,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2134,6 +1995,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2144,6 +2088,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Αποθήκη"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2152,7 +2102,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2236,11 +2186,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 847f67fcce5..977841deaf8 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:31+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Default Purchase Pricelist"
@@ -144,6 +61,11 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "You must first cancel all receptions related to this purchase order."
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Average Price"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "October"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "A pick list is generated to track the incoming products."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Reference must be unique per Company!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Quantity"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "The company name must be unique !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Supplier"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "It indicates that a picking has been done"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"receptions and the performance of your supplier's deliveries."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Print"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr "Product Categories"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "It indicates that an invoice has been paid"
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Qty"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1109,11 +987,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1122,12 +1000,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1139,7 +1022,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1158,7 +1041,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1169,7 +1052,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1218,11 +1101,6 @@ msgid "Set to Draft"
msgstr "Set to Draft"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1252,7 +1130,7 @@ msgid "Stock Move"
msgstr "Stock Move"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1354,7 +1232,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1444,18 +1322,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Purchase Order Line Make Invoice"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1540,9 +1418,9 @@ msgid "Invoice"
msgstr "Invoice"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Confirmed purchase order to invoice"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1622,7 +1500,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1674,11 +1552,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1740,6 +1613,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1809,10 +1687,10 @@ msgid "Purchase Order"
msgstr "Purchase Order"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1856,7 +1734,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1872,13 +1750,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Net Price"
@@ -1902,11 +1773,6 @@ msgid "Based on receptions"
msgstr "Based on receptions"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! You can not create recursive companies."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Supplier Reference"
@@ -1944,11 +1810,6 @@ msgid "Invoice Lines"
msgstr "Invoice Lines"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1965,7 +1826,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "The selected supplier only sells this product by %s"
@@ -1986,11 +1847,11 @@ msgid "Configuration"
msgstr "Configuration"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2006,6 +1867,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Outgoing products to invoice"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2110,11 +1976,6 @@ msgid "January"
msgstr "January"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2152,6 +2013,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total Orders by User per month"
@@ -2162,6 +2106,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Warehouse"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2170,7 +2120,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2254,11 +2204,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2428,13 +2373,13 @@ msgstr ""
#~ msgid "Incoming Shipments already processed"
#~ msgstr "Incoming Shipments already processed"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! You can not create recursive companies."
+
#, python-format
#~ msgid "No Partner!"
#~ msgstr "No Partner!"
-#~ msgid "Print"
-#~ msgstr "Print"
-
#, python-format
#~ msgid ""
#~ "You have to select a partner in the purchase form !\n"
@@ -2519,6 +2464,9 @@ msgstr ""
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Based on Purchase Order Lines"
+#~ msgid "The company name must be unique !"
+#~ msgstr "The company name must be unique !"
+
#~ msgid "Sales & Purchases"
#~ msgstr "Sales & Purchases"
@@ -2541,6 +2489,9 @@ msgstr ""
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Unable to cancel this purchase order!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Reference must be unique per Company!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Incoming Shipments Available"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 34918f1a757..145f5c3c931 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-02-15 12:20+0000\n"
"Last-Translator: mikel <mikel.martin@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra por defecto"
@@ -143,6 +60,11 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -237,7 +159,7 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -314,15 +236,15 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Pedido de compra confirmado para facturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -356,7 +278,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -425,17 +347,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -451,12 +368,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "¡La referencia debe ser única por compañía!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -477,7 +388,7 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -540,7 +451,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -571,13 +482,6 @@ msgid "Journal"
msgstr "Diario"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -594,11 +498,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Pedidos de compra que incluyen líneas no facturadas."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -622,11 +521,6 @@ msgid "Purchase Lead Time"
msgstr "Plazo de tiempo de compra"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -682,7 +576,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -775,8 +669,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -796,10 +690,9 @@ msgstr ""
"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -904,7 +797,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -915,11 +808,6 @@ msgid "Product Categories"
msgstr "Categorías de productos"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que una factura ha sido pagada."
@@ -1018,11 +906,6 @@ msgid "Qty"
msgstr "Ctdad"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1072,7 +955,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1083,11 +966,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Pedidos del año"
@@ -1114,11 +992,11 @@ msgstr ""
"presupuesto se convierte en un pedido de compra confirmado."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1127,12 +1005,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1144,7 +1027,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1163,7 +1046,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1174,7 +1057,7 @@ msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1223,11 +1106,6 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1257,7 +1135,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1359,7 +1237,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1449,18 +1327,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PC: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productos salientes a facturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1545,9 +1423,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1627,7 +1505,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1679,11 +1557,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Método facturación"
@@ -1745,6 +1618,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1814,10 +1692,10 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1861,7 +1739,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1877,13 +1755,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Precio neto"
@@ -1907,11 +1778,6 @@ msgid "Based on receptions"
msgstr "Basado en recepciones"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referencia proveedor"
@@ -1949,11 +1815,6 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1971,7 +1832,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1992,11 +1853,11 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2012,6 +1873,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2116,11 +1982,6 @@ msgid "January"
msgstr "Enero"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2158,6 +2019,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2168,6 +2112,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2176,7 +2126,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2274,11 +2224,6 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivamente."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de compra que están en estado borrador"
@@ -2747,9 +2692,6 @@ msgstr "Pedidos"
#~ msgid "My Board"
#~ msgstr "Mi tablero"
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
#, python-format
#~ msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
#~ msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
@@ -2870,6 +2812,9 @@ msgstr "Pedidos"
#~ msgid "You try to assign a lot which is not from the same product"
#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
#~ msgid "You must assign a production lot for this product"
#~ msgstr "Debe asignar un lote de producción para este producto"
@@ -3073,10 +3018,16 @@ msgstr "Pedidos"
#~ msgid "Order in current month"
#~ msgstr "Pedido en mes actual"
+#~ msgid "The company name must be unique !"
+#~ msgstr "¡El nombre de la compañía debe ser único!"
+
#, python-format
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "¡Incapaz de cancelar este pedido de compra!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "¡La referencia debe ser única por compañía!"
+
#~ msgid "Purchase orders which are not approved yet."
#~ msgstr "Pedidos de compra no aprobados aún"
@@ -3288,3 +3239,6 @@ msgstr "Pedidos"
#~ msgid "Back Orders"
#~ msgstr "Pedidos pendientes"
+
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 3ed68a3cf7e..84ee2f81707 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2009-09-23 15:07+0000\n"
"Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra predeterminada"
@@ -144,6 +61,11 @@ msgstr ""
"seleccionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,14 +235,14 @@ msgstr ""
"las líneas de la orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -421,17 +343,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -447,12 +364,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -473,7 +384,7 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -536,7 +447,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -567,13 +478,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -590,11 +494,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -618,11 +517,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -672,7 +566,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -765,8 +659,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -784,10 +678,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -892,7 +785,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -903,11 +796,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1006,11 +894,6 @@ msgid "Qty"
msgstr "Ctdad"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1060,7 +943,7 @@ msgid "Date Approved"
msgstr "Fecha de aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1071,11 +954,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1099,11 +977,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1112,12 +990,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1129,7 +1012,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1148,7 +1031,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1159,7 +1042,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1208,11 +1091,6 @@ msgid "Set to Draft"
msgstr "Establecer como borrador"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "notas"
@@ -1242,7 +1120,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1341,7 +1219,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1431,18 +1309,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1527,8 +1405,8 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1609,7 +1487,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1661,11 +1539,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Control de facturación"
@@ -1727,6 +1600,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1796,10 +1674,10 @@ msgid "Purchase Order"
msgstr "Orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1841,7 +1719,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1857,13 +1735,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Precio neto"
@@ -1887,11 +1758,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1926,11 +1792,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1944,7 +1805,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1965,11 +1826,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1985,6 +1846,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2089,11 +1955,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2131,6 +1992,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2141,6 +2085,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2149,7 +2099,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2233,11 +2183,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index c7f73ab8b9c..5d94e4f5a4d 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-01-14 04:45+0000\n"
"Last-Translator: Carlos-smile <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra por defecto"
@@ -143,6 +60,11 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Pedido de compra confirmado para facturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -423,17 +345,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -449,12 +366,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -475,7 +386,7 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -538,7 +449,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -569,13 +480,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -592,11 +496,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -620,11 +519,6 @@ msgid "Purchase Lead Time"
msgstr "Plazo de tiempo de compra"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que una factura ha sido pagada."
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Ctdad"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1112,11 +990,11 @@ msgstr ""
"presupuesto se convierte en un pedido de compra confirmado."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1447,18 +1325,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productos salientes a facturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1543,9 +1421,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1625,7 +1503,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1677,11 +1555,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Método facturación"
@@ -1743,6 +1616,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1812,10 +1690,10 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1860,7 +1738,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1876,13 +1754,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Precio neto"
@@ -1906,11 +1777,6 @@ msgid "Based on receptions"
msgstr "Basado en recepciones"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referencia proveedor"
@@ -1948,11 +1814,6 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1970,7 +1831,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1991,11 +1852,11 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2011,6 +1872,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2115,11 +1981,6 @@ msgid "January"
msgstr "Enero"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2157,6 +2018,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2167,6 +2111,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2175,7 +2125,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2271,11 +2221,6 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2433,12 +2378,12 @@ msgstr "Pedidos"
#~ msgid "Wrong Product UOM !"
#~ msgstr "¡UdM del producto errónea!"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
#~ msgid "State"
#~ msgstr "Estado"
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "¡Falta empresa!"
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 4c4771d02da..1d97070870b 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-02-18 21:55+0000\n"
"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
"Language: \n"
#. module: purchase
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra por defecto"
@@ -144,6 +61,11 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -238,7 +160,7 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -315,15 +237,15 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Pedido de compra confirmado para facturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -357,7 +279,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -426,17 +348,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -452,12 +369,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "¡La referencia debe ser única por compañía!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -478,7 +389,7 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -541,7 +452,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -572,13 +483,6 @@ msgid "Journal"
msgstr "Diario"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -595,11 +499,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Ordenes de compra que incluyen líneas no facturadas."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -623,11 +522,6 @@ msgid "Purchase Lead Time"
msgstr "Plazo de tiempo de compra"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -683,7 +577,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -776,8 +670,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -797,10 +691,9 @@ msgstr ""
"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -905,7 +798,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -916,11 +809,6 @@ msgid "Product Categories"
msgstr "Categorías de productos"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que una factura ha sido pagada."
@@ -1019,11 +907,6 @@ msgid "Qty"
msgstr "Ctdad"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1073,7 +956,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1084,11 +967,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Orden del año"
@@ -1115,11 +993,11 @@ msgstr ""
"presupuesto se convierte en un pedido de compra confirmado."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1128,12 +1006,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1145,7 +1028,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1164,7 +1047,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1175,7 +1058,7 @@ msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1224,11 +1107,6 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1258,7 +1136,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1360,7 +1238,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1450,18 +1328,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productos salientes a facturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1546,9 +1424,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1628,7 +1506,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1680,11 +1558,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Método facturación"
@@ -1746,6 +1619,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1815,10 +1693,10 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1862,7 +1740,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1878,13 +1756,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Precio neto"
@@ -1908,11 +1779,6 @@ msgid "Based on receptions"
msgstr "Basado en recepciones"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referencia proveedor"
@@ -1950,11 +1816,6 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1972,7 +1833,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1993,11 +1854,11 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2013,6 +1874,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2117,11 +1983,6 @@ msgid "January"
msgstr "Enero"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2159,6 +2020,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2169,6 +2113,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2177,7 +2127,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2275,11 +2225,6 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivamente."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ordenes de compra que se encuentran en estado de borrador"
@@ -2398,8 +2343,8 @@ msgstr "Pedidos"
#~ msgid "Order Line"
#~ msgstr "Línea del pedido"
-#~ msgid "Print"
-#~ msgstr "Imprimir"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
#, python-format
#~ msgid "No Partner!"
@@ -3097,6 +3042,9 @@ msgstr "Pedidos"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Based on Purchase Order Lines"
+#~ msgid "The company name must be unique !"
+#~ msgstr "¡El nombre de la compañía debe ser único!"
+
#~ msgid "Is a Back Order"
#~ msgstr "Es un pedido pendiente"
@@ -3112,6 +3060,9 @@ msgstr "Pedidos"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "¡Incapaz de cancelar este pedido de compra!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "¡La referencia debe ser única por compañía!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Envíos entrantes disponibles"
@@ -3289,3 +3240,6 @@ msgstr "Pedidos"
#~ msgid "Back Orders"
#~ msgstr "Albaranes pendientes"
+
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 3e5b29fad79..8fc581321f6 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-02-09 21:06+0000\n"
"Last-Translator: mariofabian <mcdc1983@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Tarifa de compra por defecto"
@@ -144,6 +61,11 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -238,7 +160,7 @@ msgid "Average Price"
msgstr "Precio promedio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -315,15 +237,15 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Pedido de compra confirmado para facturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -357,7 +279,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -426,17 +348,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -452,12 +369,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "¡La referencia debe ser única por Compañia!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -478,7 +389,7 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -541,7 +452,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -572,13 +483,6 @@ msgid "Journal"
msgstr "Diario"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -595,11 +499,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Pedidos de compra que incluyen líneas no facturadas."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -623,11 +522,6 @@ msgid "Purchase Lead Time"
msgstr "Plazo de tiempo de compra"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -683,7 +577,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -776,8 +670,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -797,10 +691,9 @@ msgstr ""
"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -905,7 +798,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -916,11 +809,6 @@ msgid "Product Categories"
msgstr "Categorías de productos"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que una factura ha sido pagada."
@@ -1019,11 +907,6 @@ msgid "Qty"
msgstr "Ctdad"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1073,7 +956,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1084,11 +967,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Pedido anual"
@@ -1115,11 +993,11 @@ msgstr ""
"presupuesto se convierte en un pedido de compra confirmado."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1128,12 +1006,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1145,7 +1028,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1164,7 +1047,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1175,7 +1058,7 @@ msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1224,11 +1107,6 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1258,7 +1136,7 @@ msgid "Stock Move"
msgstr "Movimiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1360,7 +1238,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1450,18 +1328,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea de pedido de compra realizar factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productos salientes a facturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1546,9 +1424,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1628,7 +1506,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1680,11 +1558,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Método facturación"
@@ -1746,6 +1619,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1815,10 +1693,10 @@ msgid "Purchase Order"
msgstr "Orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1862,7 +1740,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1878,13 +1756,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Precio neto"
@@ -1908,11 +1779,6 @@ msgid "Based on receptions"
msgstr "Basado en recepciones"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! No puede crear compañías recursivas."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referencia proveedor"
@@ -1950,11 +1816,6 @@ msgid "Invoice Lines"
msgstr "Detalle de factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1972,7 +1833,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1993,11 +1854,11 @@ msgid "Configuration"
msgstr "Configuración"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2013,6 +1874,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2117,11 +1983,6 @@ msgid "January"
msgstr "Enero"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2159,6 +2020,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2169,6 +2113,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2177,7 +2127,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2275,11 +2225,6 @@ msgid "Pricelist Versions"
msgstr "Versiones de lista de precios"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Error! Usted no puede crear miembros asociados recursivos"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de compra en estado borrador"
@@ -2717,6 +2662,9 @@ msgstr "Pedidos"
#~ msgid "Incoming Shipments already processed"
#~ msgstr "Envíos entrantes ya procesados"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! No puede crear compañías recursivas."
+
#, python-format
#~ msgid "No Partner!"
#~ msgstr "¡Falta empresa!"
@@ -2724,9 +2672,6 @@ msgstr "Pedidos"
#~ msgid "Available"
#~ msgstr "Disponible"
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
#~ msgid "Create or Import Suppliers"
#~ msgstr "Crear o importar proveedores"
@@ -2816,6 +2761,9 @@ msgstr "Pedidos"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Pre-Generar Facturas en borrador en base a pedidos de compra"
+#~ msgid "The company name must be unique !"
+#~ msgstr "¡El nombre de la compañía debe ser único!"
+
#~ msgid "Is a Back Order"
#~ msgstr "Es un pedido pendiente"
@@ -2856,6 +2804,9 @@ msgstr "Pedidos"
#~ msgid "Dashboard"
#~ msgstr "Panel de Control"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "¡La referencia debe ser única por Compañia!"
+
#~ msgid ""
#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
@@ -2946,6 +2897,9 @@ msgstr "Pedidos"
#~ msgid "Back Orders"
#~ msgstr "Pedidos pendientes"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Error! Usted no puede crear miembros asociados recursivos"
+
#~ msgid "Default Invoicing Control Method"
#~ msgstr "Método Control de Facturación por Defecto"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 5300be56011..9a2fc09e2a5 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:32+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: field:purchase.order,name:0
@@ -111,89 +111,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Vaikimisi ostu hinnakiri"
@@ -213,6 +130,11 @@ msgstr ""
"arvutab see tarnija hinna valitud toodetele/kogustele."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -253,16 +175,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -305,7 +227,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -375,14 +297,14 @@ msgstr ""
"planeeritud kuupäev."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -417,7 +339,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -483,17 +405,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -509,12 +426,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -535,7 +446,7 @@ msgid "Quantity"
msgstr "Kogus"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -598,7 +509,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -629,13 +540,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -647,11 +551,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -675,11 +574,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -729,7 +623,7 @@ msgid "Supplier"
msgstr "Tarnija"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -822,8 +716,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -841,10 +735,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Ladu"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -949,7 +842,7 @@ msgid "Stock Moves"
msgstr "Lao liikumised"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -960,11 +853,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1063,11 +951,6 @@ msgid "Qty"
msgstr "Kogus"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1117,7 +1000,7 @@ msgid "Date Approved"
msgstr "Heaks kiitmise kuupäev"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1128,11 +1011,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1156,11 +1034,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1169,12 +1047,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1186,7 +1069,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1205,7 +1088,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1216,7 +1099,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1265,11 +1148,6 @@ msgid "Set to Draft"
msgstr "Määra mustandiks"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Märkused"
@@ -1299,7 +1177,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1392,7 +1270,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1482,18 +1360,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1578,8 +1456,8 @@ msgid "Invoice"
msgstr "Arve"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1660,7 +1538,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1712,11 +1590,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
msgid "Approve"
msgstr "Nõustu"
@@ -1773,6 +1646,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1827,10 +1705,10 @@ msgid "Messages"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1872,7 +1750,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1888,13 +1766,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Netohind"
@@ -1918,11 +1789,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1957,11 +1823,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1975,7 +1836,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1996,11 +1857,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2016,6 +1877,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2115,11 +1981,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2157,6 +2018,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2167,6 +2111,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Ladu"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2175,7 +2125,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2254,11 +2204,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 26b42d0fe97..b321325b628 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:55+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Oletushinnasto ostoille"
@@ -144,6 +61,11 @@ msgstr ""
"hinnan kyseiselle tuotteille/määrille."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -238,7 +160,7 @@ msgid "Average Price"
msgstr "Keskimääräinen hinta"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -315,15 +237,15 @@ msgstr ""
"tuotteille."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Laskutettavat vahvistetut ostotilaukset"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -357,7 +279,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -426,17 +348,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Lokakuu"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -452,12 +369,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Keräilylista on luotu saapuvien tavaroiden seuraamiseksi"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -478,7 +389,7 @@ msgid "Quantity"
msgstr "Määrä"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -541,7 +452,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -572,13 +483,6 @@ msgid "Journal"
msgstr "Päiväkirja"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -595,11 +499,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Ostotilaukset jotka sisältävät laskuttamattomia rivejä"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Yrityksen nimen pitää olla uniikki!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -623,11 +522,6 @@ msgid "Purchase Lead Time"
msgstr "Oston läpimenoaika"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -682,7 +576,7 @@ msgid "Supplier"
msgstr "Toimittaja"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -775,8 +669,8 @@ msgid "It indicates that a picking has been done"
msgstr "Merkitsee että keräilylista on tehty"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -796,10 +690,9 @@ msgstr ""
"yrityksesi tavaranvastaanoton ja toimittajiesi toimituskyvyn."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Varasto"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Tulosta"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -904,7 +797,7 @@ msgid "Stock Moves"
msgstr "Varastosiirrot"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -915,11 +808,6 @@ msgid "Product Categories"
msgstr "Tuotekategoriat"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Merkitsee että lasku on maksettu"
@@ -1018,11 +906,6 @@ msgid "Qty"
msgstr "Määrä"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1072,7 +955,7 @@ msgid "Date Approved"
msgstr "Hyväksymispäivämäärä"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1083,11 +966,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Vuoden tilaukset"
@@ -1113,11 +991,11 @@ msgstr ""
"vahvistaa sen. Tarjouspyynnöstä tulee vahvistettu ostotilaus."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1126,12 +1004,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1143,7 +1026,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1162,7 +1045,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1173,7 +1056,7 @@ msgid "Purchase Dashboard"
msgstr "Hankintojen Työtila"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1222,11 +1105,6 @@ msgid "Set to Draft"
msgstr "Aseta luonnokseksi"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Huomautukset"
@@ -1256,7 +1134,7 @@ msgid "Stock Move"
msgstr "Varastosiirto"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1358,7 +1236,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1448,18 +1326,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Ostotilausrivi luo laskun"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Laskutettavat lähtevät tuotteet"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1544,9 +1422,9 @@ msgid "Invoice"
msgstr "Lasku"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Laskutettavat vahvistetut ostotilaukset"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1626,7 +1504,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1678,11 +1556,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Laskujen hallinta"
@@ -1744,6 +1617,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1812,10 +1690,10 @@ msgid "Purchase Order"
msgstr "Ostotilaus"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1859,7 +1737,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1875,13 +1753,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Nettohinta"
@@ -1905,11 +1776,6 @@ msgid "Based on receptions"
msgstr "Perustuu vastaanottoihin"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Toimittajan Viite"
@@ -1946,11 +1812,6 @@ msgid "Invoice Lines"
msgstr "Laskurivit"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1967,7 +1828,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -1988,11 +1849,11 @@ msgid "Configuration"
msgstr "Määritykset"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2008,6 +1869,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Laskutettavat lähtevät tuotteet"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2112,11 +1978,6 @@ msgid "January"
msgstr "Tammikuu"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2154,6 +2015,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Tilaukset käyttäjittäin ja kuukausittain yhteensä"
@@ -2164,6 +2108,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2172,7 +2122,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2257,11 +2207,6 @@ msgid "Pricelist Versions"
msgstr "Hinnaston versiot"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Virhe! Rekursiivisen kumppanin luonti ei ole sallittu."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Luonnostilassa olevat ostotilaukset"
@@ -2675,12 +2620,12 @@ msgstr "Tilaukset"
#~ msgid "purchase.installer"
#~ msgstr "purchase.installer"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
+
#~ msgid "State"
#~ msgstr "Tila"
-#~ msgid "Print"
-#~ msgstr "Tulosta"
-
#~ msgid "General Information"
#~ msgstr "Yleiset tiedot"
@@ -2997,6 +2942,9 @@ msgstr "Tilaukset"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Perustuu ostotilausriveihin"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Yrityksen nimen pitää olla uniikki!"
+
#~ msgid "Is a Back Order"
#~ msgstr "on tilattava"
@@ -3012,6 +2960,9 @@ msgstr "Tilaukset"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Ei voi peruuttaa tätä ostotilausta!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Saapuvia toimituksia saatavilla"
@@ -3055,5 +3006,8 @@ msgstr "Tilaukset"
#~ msgid "Back Orders"
#~ msgstr "Jälkitilaukset"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Virhe! Rekursiivisen kumppanin luonti ei ole sallittu."
+
#~ msgid "Order in current year"
#~ msgstr "Kuluvan vuoden tilaukset"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index c73170b9615..e77bb241de7 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-26 15:00+0000\n"
"Last-Translator: Numérigraphe <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -48,89 +48,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Liste de prix d'achat par défaut"
@@ -151,6 +68,11 @@ msgstr ""
"sélectionnés."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -237,7 +159,7 @@ msgid "Average Price"
msgstr "Prix moyen"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -316,15 +238,15 @@ msgstr ""
"de la commande d'achat."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Ordres d'achat confirmés à facturer"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -358,7 +280,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -428,17 +350,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr "Vous devez attribuer un numéro de série pour cet article."
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octobre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -454,12 +371,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Un bon de transfert est enregistré pour suivre les articles entrants"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "La référence doit être unique par société !"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -480,7 +391,7 @@ msgid "Quantity"
msgstr "Quantité"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -543,7 +454,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -574,13 +485,6 @@ msgid "Journal"
msgstr "Journal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -597,11 +501,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Commmande d'achat qui possèdent des lignes non facturées"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Le nom de la société doit être unique !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -625,11 +524,6 @@ msgid "Purchase Lead Time"
msgstr "Délai d'achat"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -685,7 +579,7 @@ msgid "Supplier"
msgstr "Fournisseur"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -778,8 +672,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indique qu'une réception de marchandise a été effectuée."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -800,10 +694,9 @@ msgstr ""
"livraison de vos fournisseurs."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Entrepôt"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimer"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -908,7 +801,7 @@ msgid "Stock Moves"
msgstr "Mouvements de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -919,11 +812,6 @@ msgid "Product Categories"
msgstr "Catégories d'articles"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Ceci indique qu'une facture a été payée"
@@ -1024,11 +912,6 @@ msgid "Qty"
msgstr "Qté"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1078,7 +961,7 @@ msgid "Date Approved"
msgstr "Date approbation"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1089,11 +972,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Commande de l'année"
@@ -1120,11 +998,11 @@ msgstr ""
"un bon de commande confirmé."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1133,12 +1011,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1150,7 +1033,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1169,7 +1052,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1180,7 +1063,7 @@ msgid "Purchase Dashboard"
msgstr "Tableau de bord des achats"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1229,11 +1112,6 @@ msgid "Set to Draft"
msgstr "Mettre en brouillon"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1263,7 +1141,7 @@ msgid "Stock Move"
msgstr "Mouvement de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1365,7 +1243,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1455,18 +1333,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Créer la facture des lignes de commande d'achat"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Expéditions à facturer"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1551,9 +1429,9 @@ msgid "Invoice"
msgstr "Facture"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Ordres d'achat confirmés à facturer"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1633,7 +1511,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1685,11 +1563,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Méthode de facturation"
@@ -1751,6 +1624,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1820,10 +1698,10 @@ msgid "Purchase Order"
msgstr "Bon de commande"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1868,7 +1746,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1884,13 +1762,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Prix net"
@@ -1914,11 +1785,6 @@ msgid "Based on receptions"
msgstr "Basé sur les réceptions"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Référence du fournisseur"
@@ -1956,11 +1822,6 @@ msgid "Invoice Lines"
msgstr "Lignes de facture"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1978,7 +1839,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Le fournisseur sélectionné peut seulement vendre cet article par %s"
@@ -1999,11 +1860,11 @@ msgid "Configuration"
msgstr "Configuration"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2019,6 +1880,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Expéditions à facturer"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2123,11 +1989,6 @@ msgid "January"
msgstr "Janvier"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2165,6 +2026,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total des commandes par utilisateur par mois"
@@ -2175,6 +2119,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2183,7 +2133,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2281,12 +2231,6 @@ msgid "Pricelist Versions"
msgstr "Versions de la liste de prix"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Bons de commande en état brouillon"
@@ -2670,12 +2614,12 @@ msgstr "Commandes"
#~ msgid " Month "
#~ msgstr " Mois "
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
+
#~ msgid "State"
#~ msgstr "État"
-#~ msgid "Print"
-#~ msgstr "Imprimer"
-
#~ msgid "Address Contact Name"
#~ msgstr "Adresse du nom du contact"
@@ -3163,9 +3107,15 @@ msgstr "Commandes"
#~ msgid "Month-1"
#~ msgstr "Mois -1"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "La référence doit être unique par société !"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Réception disponible"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Le nom de la société doit être unique !"
+
#~ msgid "UoM Categories"
#~ msgstr "Catégories d'unité"
@@ -3180,3 +3130,7 @@ msgstr "Commandes"
#~ msgid "Back Orders"
#~ msgstr "Reliquats"
+
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr ""
+#~ "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index f76110c0dff..279c2e26061 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2010-11-02 16:55+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Galician <gl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -142,6 +59,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,9 +674,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
msgstr ""
#. module: purchase
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index d3b0f5e22e5..fc91dd3bd04 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-01-30 20:08+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Uobičajeni cjenik nabave"
@@ -143,6 +60,11 @@ msgstr ""
"odabrane proizvode/količine."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Postoje neotkazane primke vezane na ovaj nalog."
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Prosječna cijena"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Potvrđeni nalozi nabave u račun"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -422,17 +344,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Listopad"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -448,12 +365,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "A pick list is generated to track the incoming products."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Vezna oznaka je već korištena."
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -474,7 +385,7 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -537,7 +448,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -568,13 +479,6 @@ msgid "Journal"
msgstr "Dnevnik"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -591,11 +495,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Naziv organizacije mora biti jedinstven!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -619,11 +518,6 @@ msgid "Purchase Lead Time"
msgstr "Vodeće vrijeme nabave"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -678,7 +572,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -771,8 +665,8 @@ msgid "It indicates that a picking has been done"
msgstr "Označava da je izvršen prijem proizvoda"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -792,10 +686,9 @@ msgstr ""
"receptions and the performance of your supplier's deliveries."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Ispis"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -900,7 +793,7 @@ msgid "Stock Moves"
msgstr "Skladišni prijenosi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -911,11 +804,6 @@ msgid "Product Categories"
msgstr "Grupe proizvoda"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Označava da je račun plaćen"
@@ -1014,11 +902,6 @@ msgid "Qty"
msgstr "Kol."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1068,7 +951,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1079,11 +962,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1109,11 +987,11 @@ msgstr ""
"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1122,12 +1000,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1139,7 +1022,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1158,7 +1041,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1169,7 +1052,7 @@ msgid "Purchase Dashboard"
msgstr "Upravljačka ploča nabave"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1218,11 +1101,6 @@ msgid "Set to Draft"
msgstr "Postavi na nacrt"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Bilješke"
@@ -1252,7 +1130,7 @@ msgid "Stock Move"
msgstr "Skladišni prijenosi"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1354,7 +1232,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1444,18 +1322,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Kreiraj račun iz stavki naloga za nabavu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "NN: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Nefakturirani izlaz"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1540,9 +1418,9 @@ msgid "Invoice"
msgstr "Račun"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Potvrđeni nalozi nabave u račun"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1622,7 +1500,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1674,11 +1552,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Kontrola računa"
@@ -1740,6 +1613,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1809,10 +1687,10 @@ msgid "Purchase Order"
msgstr "Nalog za nabavu"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1856,7 +1734,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1872,13 +1750,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Net Cijena"
@@ -1902,11 +1773,6 @@ msgid "Based on receptions"
msgstr "Prema primkama"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Oznaka dobavljača"
@@ -1943,11 +1809,6 @@ msgid "Invoice Lines"
msgstr "Stavke računa"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1964,7 +1825,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1985,11 +1846,11 @@ msgid "Configuration"
msgstr "Postava"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2005,6 +1866,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Nefakturirani izlaz"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2109,11 +1975,6 @@ msgid "January"
msgstr "Siječanj"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2151,6 +2012,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Ukupno naloga po korisniku i mjesecu"
@@ -2161,6 +2105,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2169,7 +2119,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2263,11 +2213,6 @@ msgid "Pricelist Versions"
msgstr "Verzije cjenika"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Nalozi u stanju 'Nacrt'"
@@ -2386,8 +2331,8 @@ msgstr "Orders"
#~ msgid "Order Line"
#~ msgstr "Stavka naloga"
-#~ msgid "Print"
-#~ msgstr "Ispis"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
#~ msgid "Address Contact Name"
#~ msgstr "Address Contact Name"
@@ -2745,6 +2690,12 @@ msgstr "Orders"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Prema stavkama naloga za nabavu"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Naziv organizacije mora biti jedinstven!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Vezna oznaka je već korištena."
+
#~ msgid "Purchase orders which are not approved yet."
#~ msgstr "Neodobreni nalozi."
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 4766d0ba88a..acb2c7854e7 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:47+0000\n"
"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Alapértelmezett beszerzési árlista"
@@ -144,6 +61,11 @@ msgstr ""
"árát."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Átlagár"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"dátuma."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Számlázandó megerősített szállítói megrendelés"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Október"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -451,12 +368,6 @@ msgstr ""
"A rendszer kiszedési listát készített a beérkező termékek nyomon követésére."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -477,7 +388,7 @@ msgid "Quantity"
msgstr "Mennyiség"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -540,7 +451,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -571,13 +482,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -594,11 +498,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -622,11 +521,6 @@ msgid "Purchase Lead Time"
msgstr "Beszerzési átfutási idő"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -681,7 +575,7 @@ msgid "Supplier"
msgstr "Szállító"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -774,8 +668,8 @@ msgid "It indicates that a picking has been done"
msgstr "Jelzi, hogy a kiszedést végrehajtották."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -796,10 +690,9 @@ msgstr ""
"vizsgálatát."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Raktár"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Nyomtatás"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -904,7 +797,7 @@ msgid "Stock Moves"
msgstr "Készletmozgások"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -915,11 +808,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Jelzi, hogy a számlát kifizették."
@@ -1019,11 +907,6 @@ msgid "Qty"
msgstr "Mennyiség"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1073,7 +956,7 @@ msgid "Date Approved"
msgstr "Dátum jóváhagyása"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1084,11 +967,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1115,11 +993,11 @@ msgstr ""
"szállítói megrendeléssé válik."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1128,12 +1006,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1145,7 +1028,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1164,7 +1047,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1175,7 +1058,7 @@ msgid "Purchase Dashboard"
msgstr "Beszerzési vezérlőpult"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1224,11 +1107,6 @@ msgid "Set to Draft"
msgstr "Beállítás tervezetnek"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Megjegyzések"
@@ -1258,7 +1136,7 @@ msgid "Stock Move"
msgstr "Készletmozgás"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1360,7 +1238,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1450,18 +1328,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Szállítói megrendelési sorokból számla készítése"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Számlázandó kimenő termékek"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1546,9 +1424,9 @@ msgid "Invoice"
msgstr "Számla"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Számlázandó megerősített szállítói megrendelés"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1628,7 +1506,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1680,11 +1558,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Számlaellenőrzés"
@@ -1746,6 +1619,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1815,10 +1693,10 @@ msgid "Purchase Order"
msgstr "Szállítói megrendelés"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1863,7 +1741,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1879,13 +1757,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Nettó ár"
@@ -1909,11 +1780,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Szállítói hivatkozás"
@@ -1951,11 +1817,6 @@ msgid "Invoice Lines"
msgstr "Számlasorok"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1973,7 +1834,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, 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"
@@ -1994,11 +1855,11 @@ msgid "Configuration"
msgstr "Beállítás"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2014,6 +1875,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Számlázandó kimenő termékek"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2118,11 +1984,6 @@ msgid "January"
msgstr "Január"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2160,6 +2021,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Felhasználónkénti összes megrendelés havonta"
@@ -2170,6 +2114,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Raktár"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2178,7 +2128,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2273,11 +2223,6 @@ msgid "Pricelist Versions"
msgstr "Árlista változatok"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2534,9 +2479,6 @@ msgstr "Megrendelések"
#~ msgid " Month "
#~ msgstr " Hónap "
-#~ msgid "Print"
-#~ msgstr "Nyomtatás"
-
#~ msgid "General Information"
#~ msgstr "Általános információ"
@@ -2621,6 +2563,9 @@ msgstr "Megrendelések"
#~ msgid "Do you want to generate the supplier invoices ?"
#~ msgstr "El akarja készíteni a bejövő számlákat?"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+
#~ msgid "Approved by Supplier"
#~ msgstr "Szállító által jóváhagyott"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 5f57f13dcbd..c5137969528 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:44+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Dasar Harga Pembelian"
@@ -141,6 +58,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -181,16 +103,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -233,7 +155,7 @@ msgid "Average Price"
msgstr "Harga Rata-rata"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -308,14 +230,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -350,7 +272,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -419,17 +341,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -445,12 +362,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -471,7 +382,7 @@ msgid "Quantity"
msgstr "Kuantitas"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -534,7 +445,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -565,13 +476,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -588,11 +492,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -616,11 +515,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -672,7 +566,7 @@ msgid "Supplier"
msgstr "Pemasok"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -765,8 +659,8 @@ msgid "It indicates that a picking has been done"
msgstr "Hal ini menunjukkan bahwa pengambilan telah dilakukan"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -787,10 +681,9 @@ msgstr ""
"Anda."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Gudang"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Cetak"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -895,7 +788,7 @@ msgid "Stock Moves"
msgstr "Perpindahan Stok"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -906,11 +799,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Ini adalah indikator bahwa faktur telah dibayarkan"
@@ -1009,11 +897,6 @@ msgid "Qty"
msgstr "Qty"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1063,7 +946,7 @@ msgid "Date Approved"
msgstr "Tanggal Disetujui"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1074,11 +957,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1105,11 +983,11 @@ msgstr ""
"sudah dikonfirmasi"
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1118,12 +996,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1135,7 +1018,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1154,7 +1037,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1165,7 +1048,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1214,11 +1097,6 @@ msgid "Set to Draft"
msgstr "Atur ke draft"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Catatan"
@@ -1248,7 +1126,7 @@ msgid "Stock Move"
msgstr "Perpindahan Stok"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1350,7 +1228,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1440,18 +1318,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1536,8 +1414,8 @@ msgid "Invoice"
msgstr "Faktur"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1618,7 +1496,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1670,11 +1548,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Kontrol Tagihan"
@@ -1736,6 +1609,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1805,10 +1683,10 @@ msgid "Purchase Order"
msgstr "Order Pembelian"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1853,7 +1731,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1869,13 +1747,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Harga Bersih"
@@ -1899,11 +1770,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referensi Pemasok"
@@ -1940,11 +1806,6 @@ msgid "Invoice Lines"
msgstr "Daftar faktur"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1961,7 +1822,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1982,11 +1843,11 @@ msgid "Configuration"
msgstr "Konfigurasi"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2002,6 +1863,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2106,11 +1972,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2148,6 +2009,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Jumlah Pesanan oleh Pengguna per bulan"
@@ -2158,6 +2102,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Gudang"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2166,7 +2116,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2250,11 +2200,6 @@ msgid "Pricelist Versions"
msgstr "Versi Daftar Harga"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2412,12 +2357,12 @@ msgstr ""
#~ msgid "purchase.installer"
#~ msgstr "Installer pembelian"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
+
#~ msgid "State"
#~ msgstr "State"
-#~ msgid "Print"
-#~ msgstr "Cetak"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Rekanan Tidak ada"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index db00b8dbdf3..6a68e716023 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:52+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Listino acquisti predefinito"
@@ -143,6 +60,11 @@ msgstr ""
"il prezzo del fornitore per i prodotti e le quantità selezionate"
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Prezzo medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"ordine d'acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Ordine d'acquisto confermato da fatturare"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Ottobre"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -451,12 +368,6 @@ msgstr ""
"Una lista di prelievo è generata per controllare i prodotti in ingresso."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -477,7 +388,7 @@ msgid "Quantity"
msgstr "Quantità"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -540,7 +451,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -571,13 +482,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -594,11 +498,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -622,11 +521,6 @@ msgid "Purchase Lead Time"
msgstr "Tempo di consegna acquisto"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -681,7 +575,7 @@ msgid "Supplier"
msgstr "Fornitore"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -774,8 +668,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica che è stato eseguito un movimento merci"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -796,10 +690,9 @@ msgstr ""
"performance delle spedizioni dei fornitori."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Stampa"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -904,7 +797,7 @@ msgid "Stock Moves"
msgstr "Movimenti di magazzino"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -915,11 +808,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica che una fattura è stata pagata"
@@ -1019,11 +907,6 @@ msgid "Qty"
msgstr "Qta'"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1073,7 +956,7 @@ msgid "Date Approved"
msgstr "Data Approvazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1084,11 +967,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1115,11 +993,11 @@ msgstr ""
"preventivo diviene quindi un ordine di acquisto confermato."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1128,12 +1006,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1145,7 +1028,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1164,7 +1047,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1175,7 +1058,7 @@ msgid "Purchase Dashboard"
msgstr "Dashboard acquisti"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1224,11 +1107,6 @@ msgid "Set to Draft"
msgstr "Imposta come Bozza"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Note"
@@ -1258,7 +1136,7 @@ msgid "Stock Move"
msgstr "Movimento di magazzino"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1360,7 +1238,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1451,18 +1329,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Genera fattura da linea ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Prodotti in uscita da fatturare"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1547,9 +1425,9 @@ msgid "Invoice"
msgstr "Fattura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Ordine d'acquisto confermato da fatturare"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1629,7 +1507,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1681,11 +1559,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Controllo Fatturazione"
@@ -1747,6 +1620,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1816,10 +1694,10 @@ msgid "Purchase Order"
msgstr "Ordine Acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1864,7 +1742,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1880,13 +1758,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Prezzo Netto"
@@ -1910,11 +1781,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Errore! Non è possibile creare aziende ricorsive."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Riferimento fornitore"
@@ -1952,11 +1818,6 @@ msgid "Invoice Lines"
msgstr "Linee fattura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1974,7 +1835,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -1995,11 +1856,11 @@ msgid "Configuration"
msgstr "Configurazione"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2015,6 +1876,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Prodotti in uscita da fatturare"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2119,11 +1985,6 @@ msgid "January"
msgstr "Gennaio"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2161,6 +2022,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Ordini totali per utente per mese"
@@ -2171,6 +2115,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2179,7 +2129,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2275,11 +2225,6 @@ msgid "Pricelist Versions"
msgstr "Versione listino prezzi"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2667,12 +2612,12 @@ msgstr "Ordini"
#~ msgid "Wrong Product UOM !"
#~ msgstr "UOM del prodotto errata!"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Errore! Non è possibile creare aziende ricorsive."
+
#~ msgid "State"
#~ msgstr "Stato"
-#~ msgid "Print"
-#~ msgstr "Stampa"
-
#~ msgid "Address Contact Name"
#~ msgstr "Nome contatto"
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index dbbde0151f1..1b61ec78e82 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-06-21 23:39+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "ドラフト発注価格リスト"
@@ -142,6 +59,11 @@ msgid ""
msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr "平均価格"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,15 +231,15 @@ msgid ""
msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "請求のための確認済発注オーダー"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -418,17 +340,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "10月"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -444,12 +361,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "入庫製品を追跡するために集荷リストが作成されます。"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "参照は会社ごとに固有でなければいけません。"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -470,7 +381,7 @@ msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -533,7 +444,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -564,13 +475,6 @@ msgid "Journal"
msgstr "仕訳帳"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -587,11 +491,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "請求なしの行を含む発注オーダー"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "会社名は固有でなければいけません。"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -615,11 +514,6 @@ msgid "Purchase Lead Time"
msgstr "発注リードタイム"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -670,7 +564,7 @@ msgid "Supplier"
msgstr "仕入先"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -763,8 +657,8 @@ msgid "It indicates that a picking has been done"
msgstr "それは集荷は行われたことを示しています。"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -782,10 +676,9 @@ msgid ""
msgstr "受領分析はチェックの簡易化のため、会社のオーダー受領と仕入先の配達の実績の分析を行うことができます。"
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "印刷"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -890,7 +783,7 @@ msgid "Stock Moves"
msgstr "在庫移動"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -901,11 +794,6 @@ msgid "Product Categories"
msgstr "製品分類"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "これは請求書は既に支払われたことを意味しています。"
@@ -1004,11 +892,6 @@ msgid "Qty"
msgstr "数量"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1058,7 +941,7 @@ msgid "Date Approved"
msgstr "承認日"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1069,11 +952,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "年順"
@@ -1097,11 +975,11 @@ msgid ""
msgstr "この製品のための仕入先がないケースでは、買い手はフォームを手動で埋めて、確認をします。見積依頼は発注オーダー確認済となります。"
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1110,12 +988,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1127,7 +1010,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1146,7 +1029,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1157,7 +1040,7 @@ msgid "Purchase Dashboard"
msgstr "発注ダッシュボード"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1206,11 +1089,6 @@ msgid "Set to Draft"
msgstr "ドラフトに設定"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "注記"
@@ -1240,7 +1118,7 @@ msgid "Stock Move"
msgstr "在庫移動"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1340,7 +1218,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1430,18 +1308,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "発注オーダー行は請求書を作成します。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "発注オーダー:%s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "請求するための出庫製品"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1526,9 +1404,9 @@ msgid "Invoice"
msgstr "請求書"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "請求のための確認済発注オーダー"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1608,7 +1486,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1660,11 +1538,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "請求書制御"
@@ -1726,6 +1599,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1793,10 +1671,10 @@ msgid "Purchase Order"
msgstr "発注オーダー"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1838,7 +1716,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1854,13 +1732,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "正価"
@@ -1884,11 +1755,6 @@ msgid "Based on receptions"
msgstr "受領基準"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "仕入先参照"
@@ -1923,11 +1789,6 @@ msgid "Invoice Lines"
msgstr "請求書行"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1942,7 +1803,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "選択仕入先は%s によりこの製品のみを売ります。"
@@ -1963,11 +1824,11 @@ msgid "Configuration"
msgstr "設定"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1983,6 +1844,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "請求するための出庫製品"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2087,11 +1953,6 @@ msgid "January"
msgstr "1月"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2129,6 +1990,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "ユーザの月別合計オーダー"
@@ -2139,6 +2083,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2147,7 +2097,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2241,11 +2191,6 @@ msgid "Pricelist Versions"
msgstr "価格リストバージョン"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "エラー:再帰的なメンバーを作ることはできません。"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "ドラフト状態の発注オーダー"
@@ -2405,13 +2350,13 @@ msgstr "オーダー"
#~ msgid "Default Invoicing Control Method"
#~ msgstr "デフォルト請求書制御方法"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
#, python-format
#~ msgid "No Partner!"
#~ msgstr "パートナが指定されていません。"
-#~ msgid "Print"
-#~ msgstr "印刷"
-
#~ msgid "Available"
#~ msgstr "利用可能"
@@ -2479,6 +2424,9 @@ msgstr "オーダー"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "発注オーダー基準のドラフト請求書の事前作成"
+#~ msgid "The company name must be unique !"
+#~ msgstr "会社名は固有でなければいけません。"
+
#~ msgid "Destination Address"
#~ msgstr "宛先住所"
@@ -2518,6 +2466,9 @@ msgstr "オーダー"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "この発注オーダーはキャンセルできません。"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "参照は会社ごとに固有でなければいけません。"
+
#~ msgid "Dashboard"
#~ msgstr "ダッシュボード"
@@ -2762,6 +2713,9 @@ msgstr "オーダー"
#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
#~ msgstr "この製品のために定義された費用勘定がありません:%s(ID:%d)"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "エラー:再帰的なメンバーを作ることはできません。"
+
#~ msgid "Purchase Management"
#~ msgstr "発注管理"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index a21dc67d049..56dc478101f 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 18:31+0000\n"
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "디폴트 구매 가격리스트"
@@ -142,6 +59,11 @@ msgid ""
msgstr "가격리스트는 이 구매 주문에 이용되는 통화를 설정하며, 선택된 상품/수량에 대해 공급자 가격을 계산합니다."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr "이것은 모든 구매 주문 라인 상품의 최소 스케줄 날짜로 계산됩니다."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr "수량"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr "공급자"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,10 +674,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "창고"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr "수량"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr "승인된 날짜"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr "초안으로 설정"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "노트"
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr "인보이스"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "컨트롤 인보이스"
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr "구매 주문"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "순 가격"
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "창고"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index d10b982d3d4..c38cb805acf 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 18:09+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Numatytas pardavimų kainoraštis"
@@ -141,6 +58,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -181,16 +103,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -233,7 +155,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -308,14 +230,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -350,7 +272,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -416,17 +338,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -442,12 +359,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -468,7 +379,7 @@ msgid "Quantity"
msgstr "Kiekis"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -531,7 +442,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -562,13 +473,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -585,11 +489,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -613,11 +512,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -667,7 +561,7 @@ msgid "Supplier"
msgstr "Tiekėjas"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -760,8 +654,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -779,10 +673,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Sandėlis"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -887,7 +780,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -898,11 +791,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1001,11 +889,6 @@ msgid "Qty"
msgstr "Kiekis"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1055,7 +938,7 @@ msgid "Date Approved"
msgstr "Patvirtinimo data"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1066,11 +949,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1094,11 +972,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1107,12 +985,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1124,7 +1007,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1143,7 +1026,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1154,7 +1037,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1203,11 +1086,6 @@ msgid "Set to Draft"
msgstr "Nustatyti kaip juodraštį"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Pastabos"
@@ -1237,7 +1115,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1336,7 +1214,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1426,18 +1304,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1522,8 +1400,8 @@ msgid "Invoice"
msgstr "Sąskaita faktūra"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1604,7 +1482,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1656,11 +1534,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "S/F kontrolė"
@@ -1722,6 +1595,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1791,10 +1669,10 @@ msgid "Purchase Order"
msgstr "Pirkimo užsakymas"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1836,7 +1714,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1852,13 +1730,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Galutinė kaina"
@@ -1882,11 +1753,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1921,11 +1787,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1939,7 +1800,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1960,11 +1821,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1980,6 +1841,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2084,11 +1950,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2126,6 +1987,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2136,6 +2080,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Sandėlis"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2144,7 +2094,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2228,11 +2178,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index e754b6545b4..8b781b6b96d 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-16 16:24+0000\n"
"Last-Translator: Vladimirs Kuzmins <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Noklusējuma Iepirkumu Cenrādis"
@@ -144,6 +61,11 @@ msgstr ""
"produktu/daudzumu un piegādes cenu."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Vidējā Cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -311,15 +233,15 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Apstiprināts iepirkums, par kuru izrakstīt rēķinu"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -353,7 +275,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -419,17 +341,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktobris"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -446,12 +363,6 @@ msgstr ""
"Komplektēšanas saraksts ir izveidots, lai kontrolētu ienākošos produktus."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -472,7 +383,7 @@ msgid "Quantity"
msgstr "Skaits"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -535,7 +446,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -566,13 +477,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -589,11 +493,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -617,11 +516,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -673,7 +567,7 @@ msgid "Supplier"
msgstr "Piegādātājs"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -766,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Parāda, ka komplektācija ir pabeigta"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -785,10 +679,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Noliktava"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Drukāt"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -893,7 +786,7 @@ msgid "Stock Moves"
msgstr "Preču kustība Noliktavā"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -904,11 +797,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Norāda, ka rēķins ir apmaksāts"
@@ -1007,11 +895,6 @@ msgid "Qty"
msgstr "Sk."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1061,7 +944,7 @@ msgid "Date Approved"
msgstr "Datums, kurā apstiprināts"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1072,11 +955,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1100,11 +978,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1113,12 +991,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1130,7 +1013,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1149,7 +1032,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1160,7 +1043,7 @@ msgid "Purchase Dashboard"
msgstr "Iepirkumu Rīku Panelis"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1209,11 +1092,6 @@ msgid "Set to Draft"
msgstr "Atzīmēt kā Melnrakstu"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Piezīmes"
@@ -1243,7 +1121,7 @@ msgid "Stock Move"
msgstr "Noliktavas Grāmatojums"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1342,7 +1220,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1432,18 +1310,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Izejošie produkti, par kuriem piestādīt rēķinu"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1528,9 +1406,9 @@ msgid "Invoice"
msgstr "Rēķins"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Apstiprināts iepirkums, par kuru izrakstīt rēķinu"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1610,7 +1488,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1662,11 +1540,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Rēķinu Kontrole"
@@ -1728,6 +1601,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1795,10 +1673,10 @@ msgid "Purchase Order"
msgstr "Iepirkums"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1840,7 +1718,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1856,13 +1734,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Neto Cena"
@@ -1886,11 +1757,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Piegādātāja Kods"
@@ -1925,11 +1791,6 @@ msgid "Invoice Lines"
msgstr "Rēķina Rindas"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1943,7 +1804,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, 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"
@@ -1964,11 +1825,11 @@ msgid "Configuration"
msgstr "Konfigurācija"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1984,6 +1845,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Izejošie produkti, par kuriem piestādīt rēķinu"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2088,11 +1954,6 @@ msgid "January"
msgstr "Janvāris"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2130,6 +1991,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Pasūtījumi kopā pēc lietotāja pa mēnešiem"
@@ -2140,6 +2084,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Noliktava"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2148,7 +2098,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2232,11 +2182,6 @@ msgid "Pricelist Versions"
msgstr "Cenrāža Versijas"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2300,12 +2245,12 @@ msgstr "Pasūtījumi"
#~ msgid "Purchase order '%s' has been set in draft state."
#~ msgstr "Iepirkums \"%s\" ir atzīmēts kā melnraksts."
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
#~ msgid "State"
#~ msgstr "Statuss"
-#~ msgid "Print"
-#~ msgstr "Drukāt"
-
#~ msgid "Untaxed amount"
#~ msgstr "Summa bez nodokļiem"
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index da0070f2aa2..208edcbf7cf 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-06-20 04:05+0000\n"
"Last-Translator: Khulan Altangerel <khulancomp@gmail.com>\n"
"Language-Team: Mongolian <mn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Үндсэн Худалдан авах үнийн хүснэгт"
@@ -143,6 +60,11 @@ msgstr ""
"бараа/тоо ширхэг дээр үндэслэн нийлүүлэгчийн үнийг тооцоолно."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -237,7 +159,7 @@ msgid "Average Price"
msgstr "Дундаж үнэ"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"Захиалгын мөрүүдээс хамгийн ойрын огноог сонгож энэ огноог тооцоолно."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Худалдан авалтын захиалгын батлагдсан нэхэмжлэл"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "10 сар"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Ирж байгаа бараануудыг хянахаар бэлтгэх жагсаалт үүсгэгдэв."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Код компаний хэмжээнд үл давхцах байх ёстой!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Тоо ширхэг"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr "Журнал"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Нэхэмжлэгдээгүй мөр агуулж байгаа худалдан авах захиалгууд"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Компаний нэр үл давхцах байх ёстой !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr "Худалдан авалтын судалгааны хугацаа"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Нийлүүлэгч"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"чадавхи зэрэгийг шинжлэх боломжийг олгодог."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Агуулах"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Хэвлэх"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr "Барааны хөдөлгөөн"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr "Барааны ангилал"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Энэ нь нэхэмжлэл бүрэн төлөгдсөн эсэхийг илэрхийлнэ"
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Тоо"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr "Зөвшөөрсөн огноо"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Жилийн захиалга"
@@ -1112,11 +990,11 @@ msgstr ""
"захиалга болж хувирна."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Худалдан авалт"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Ноороглох"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Тэмдэглэл"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Агуулахын хөдөлгөөн"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1448,18 +1326,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Худалдан авалтын захиалгын мөрний нэхэмжлэл бэлдэх"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "ХАЗ: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Гарч байгаа нэхэмжлэх бараанууд"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1544,9 +1422,9 @@ msgid "Invoice"
msgstr "Нэхэмжлэл"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Худалдан авалтын захиалгын батлагдсан нэхэмжлэл"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1626,7 +1504,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1678,11 +1556,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Нэхэмжлэх арга"
@@ -1744,6 +1617,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1813,10 +1691,10 @@ msgid "Purchase Order"
msgstr "Худалдан авах захиалга"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1861,7 +1739,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1877,13 +1755,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Цэвэр үнэ"
@@ -1907,11 +1778,6 @@ msgid "Based on receptions"
msgstr "Хүлээн авалт дээр суурилсан"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Алдаа! Тойрог хамааралтай компани үүсгэж болохгүй."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Нийлүүлэгчийн дугаар"
@@ -1949,11 +1815,6 @@ msgid "Invoice Lines"
msgstr "Нэхэмжлэлийн мөр"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1970,7 +1831,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Сонгосон нийлүүлэгч нь энэ барааг зөвхөн %s-р борлуулдаг."
@@ -1991,11 +1852,11 @@ msgid "Configuration"
msgstr "Тохиргоо"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2011,6 +1872,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Гарч байгаа нэхэмжлэх бараанууд"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2115,11 +1981,6 @@ msgid "January"
msgstr "1 сар"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2157,6 +2018,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Нийт захиалга (сар бүр хэрэглэгчээр)"
@@ -2167,6 +2111,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Агуулах"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2175,7 +2125,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2271,11 +2221,6 @@ msgid "Pricelist Versions"
msgstr "Үнийн хувилбар"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ноорог төлөвтэй худалдан авах захиалгууд"
@@ -2601,9 +2546,6 @@ msgstr "Захиалга"
#~ msgid "State"
#~ msgstr "Төлөв"
-#~ msgid "Print"
-#~ msgstr "Хэвлэх"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Харилцагчгүй!"
@@ -2878,6 +2820,9 @@ msgstr "Захиалга"
#~ msgid "You can not move products from or to a location of the type view."
#~ msgstr "Харагдац төрөлтэй байрлалаас/байрлалруу шилжүүлж болохгүй."
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Алдаа! Тойрог хамааралтай компани үүсгэж болохгүй."
+
#~ msgid ""
#~ "Use this menu to control the invoices to be received from your supplier. "
#~ "OpenERP pregenerates draft invoices from your purchase orders or receptions, "
@@ -2916,6 +2861,9 @@ msgstr "Захиалга"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Худалдан авах захиалгын мөрүүд дээр суурилсан"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Компаний нэр үл давхцах байх ёстой !"
+
#, python-format
#~ msgid "Selected UOM does not belong to the same category as the product UOM"
#~ msgstr "Сонгосон Х.Н нь барааны Х.Н-тэй нэг ангилал биш байна."
@@ -2927,6 +2875,9 @@ msgstr "Захиалга"
#~ msgid "Invoicing Control on Purchases"
#~ msgstr "Худалдан авалтын захиалгуудын Нэхэмжлэлийн Хяналт"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Код компаний хэмжээнд үл давхцах байх ёстой!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Байгаа Ирж буй Хүргэлтүүд"
@@ -2945,6 +2896,9 @@ msgstr "Захиалга"
#~ msgid "Reference UoM"
#~ msgstr "Х.Н-н код"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
+
#~ msgid "Month-1"
#~ msgstr "Сар-1"
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index c4fc0d55826..5616b025609 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-04-01 12:25+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standard innkjøpsprisliste"
@@ -144,6 +61,11 @@ msgstr ""
"leverandørpris for valgte produkter og mengder."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Du må først kansellere alle mottak knyttet til denne innkjøpsordren"
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Gjennomsnittspris"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"produkter."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Bekreftede innkjøpsordre å fakturere"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -356,7 +278,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -425,17 +347,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -451,12 +368,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "En plukk liste er laget for å spore innkommende produkter"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Referanse må være unik pr firma!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -477,7 +388,7 @@ msgid "Quantity"
msgstr "Antall"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -540,7 +451,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -571,13 +482,6 @@ msgid "Journal"
msgstr "Journal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -594,11 +498,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Innkjøpsordre som inkluderer linjer ikke fakturert"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Firmanavn må være unikt !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -622,11 +521,6 @@ msgid "Purchase Lead Time"
msgstr "Ledetid innkjøp"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -681,7 +575,7 @@ msgid "Supplier"
msgstr "Leverandør"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -774,8 +668,8 @@ msgid "It indicates that a picking has been done"
msgstr "det indikerer at en plukking har blitt utført"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -795,10 +689,9 @@ msgstr ""
"mottakelser og resultatene til leverandør leveranser."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Skriv ut"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -903,7 +796,7 @@ msgid "Stock Moves"
msgstr "Lagerbevegelser"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -914,11 +807,6 @@ msgid "Product Categories"
msgstr "Produktkategorier"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Det indikerer at en faktura har blitt betalt"
@@ -1017,11 +905,6 @@ msgid "Qty"
msgstr "Antall"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1071,7 +954,7 @@ msgid "Date Approved"
msgstr "Godkjent dato"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1082,11 +965,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Ordre pr. år"
@@ -1112,11 +990,11 @@ msgstr ""
"ut skjemaet manuelt og bekrefte det. RFQ blir en bekreftet bestilling."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Innkjøpskonsoll"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Sett som utkast"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notater"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Lagerbevegelser"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1447,18 +1325,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Innkjøpsordrelinjer danner faktura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Utgående produkter til fakturering"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1543,9 +1421,9 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Bekreftede innkjøpsordre å fakturere"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1625,7 +1503,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1677,11 +1555,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Fakturakontroll"
@@ -1743,6 +1616,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1812,10 +1690,10 @@ msgid "Purchase Order"
msgstr "Innkjøpsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1859,7 +1737,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1875,13 +1753,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Nettopris"
@@ -1905,11 +1776,6 @@ msgid "Based on receptions"
msgstr "Basert på mottak"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Feil ! Du kan ikke lage rekursive firmaer."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Leverandør referanse"
@@ -1946,11 +1812,6 @@ msgid "Invoice Lines"
msgstr "Fakturalinjer"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1967,7 +1828,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valgte leverandøren selger dette produktet bare som %s"
@@ -1988,11 +1849,11 @@ msgid "Configuration"
msgstr "Konfigurasjon"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2008,6 +1869,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Utgående produkter til fakturering"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2112,11 +1978,6 @@ msgid "January"
msgstr "Januar"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2154,6 +2015,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totalt antall ordre pr bruker pr månded"
@@ -2164,6 +2108,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2172,7 +2122,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2268,11 +2218,6 @@ msgid "Pricelist Versions"
msgstr "Prisliste versjoner"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Innkjøpsordre som er i utkaststatus"
@@ -2359,9 +2304,6 @@ msgstr "Ordre"
#~ msgid "State"
#~ msgstr "Status"
-#~ msgid "Print"
-#~ msgstr "Skriv ut"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Ingen klient definert!"
@@ -2632,6 +2574,9 @@ msgstr "Ordre"
#~ msgid "To Approve"
#~ msgstr "Til Godkjenning"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
#~ msgid "Available"
#~ msgstr "Tilgjengelig"
@@ -2666,6 +2611,9 @@ msgstr "Ordre"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Pre-genererte fakturautkast basert på innkjøpsordre"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Firmanavn må være unikt !"
+
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Basert på innkjøpsordrelinjer"
@@ -2682,6 +2630,9 @@ msgstr "Ordre"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Kan ikke få kansellert innkjøpsordren!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referanse må være unik pr firma!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Inngående tilgj. mottak"
@@ -2875,6 +2826,9 @@ msgstr "Ordre"
#~ msgid "Back Orders"
#~ msgstr "Tilbake Ordrene"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
#~ msgid ""
#~ " * The 'Draft' state is set automatically when purchase order in draft "
#~ "state. \n"
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 2d0a0f50fa4..5fbda5a82ba 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-30 19:55+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:07+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Inkoopprijslijst"
@@ -143,6 +60,11 @@ msgstr ""
"inkoopprijs voor de geselecteerd producten."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -186,16 +108,16 @@ msgstr ""
"ingevoegd."
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr "Waarschuwing!"
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -240,7 +162,7 @@ msgid "Average Price"
msgstr "Gemiddelde prijs"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr "Factuur <b>betaald</b>."
@@ -316,15 +238,15 @@ msgstr ""
"Dit is een berekende minimale geplande datum van alle inkooporderregels."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Bevestigde inkooporder naar factuur"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -358,7 +280,7 @@ msgid "Quotation "
msgstr "Offerte "
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -427,17 +349,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr "U dient een productie partij toe te wijzen voor dit product."
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -453,12 +370,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Een pakbon wordt gegenereerd om de inkomende producten te volgen."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Referentie moet uniek zijn per bedrijf!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -479,7 +390,7 @@ msgid "Quantity"
msgstr "Aantal"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -542,7 +453,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -573,15 +484,6 @@ msgid "Journal"
msgstr "Dagboek"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-"Foutmelding: de standaard maateenheid moet in dezelfde categorie vallen als "
-"de inkoop maateenheid."
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -598,11 +500,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Inkooporder welke regels bevatten die nog niet zijn gefactureerd"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "De naam van het bedrijf moet uniek zijn!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -626,11 +523,6 @@ msgid "Purchase Lead Time"
msgstr "Voorbereidingstijd inkoop"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr "Fout: Ongeldige EAN-code"
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -686,7 +578,7 @@ msgid "Supplier"
msgstr "Leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -779,8 +671,8 @@ msgid "It indicates that a picking has been done"
msgstr "Het geeft aan dat het order verzamelen is uitgevoerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -800,10 +692,9 @@ msgstr ""
"controleren en de prestatie van uw leveranciers leveringen analyseren."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Afdrukken"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -908,7 +799,7 @@ msgid "Stock Moves"
msgstr "Goederenstromen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr "Concept inkoopporderBeheer aangemaakt."
@@ -919,11 +810,6 @@ msgid "Product Categories"
msgstr "Productcategorieën"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr "Verstuur inkooporder"
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Dit geeft aan dat de factuur is betaald."
@@ -1022,11 +908,6 @@ msgid "Qty"
msgstr "Hvhd"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr "Adressen in inkooporders"
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1076,7 +957,7 @@ msgid "Date Approved"
msgstr "Datum goedgekeurd"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1087,12 +968,6 @@ msgid "a draft purchase order"
msgstr "een concept inkooporder"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-"U probeert een partij toe te wijzen wat niet van hetzelfde product is."
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Order van jaar"
@@ -1119,11 +994,11 @@ msgstr ""
"inkooporder."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1132,12 +1007,17 @@ msgid "Outgoing Mails"
msgstr "Uitgaande E-mails"
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Berichten en communicatie historie"
@@ -1149,7 +1029,7 @@ msgid "Destination Warehouse"
msgstr "Bestemmings magazijn"
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1168,7 +1048,7 @@ msgid "Manage pricelist per supplier"
msgstr "Beheer prijslijsten per leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1179,7 +1059,7 @@ msgid "Purchase Dashboard"
msgstr "Inkoop dashboard"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1228,11 +1108,6 @@ msgid "Set to Draft"
msgstr "Naar Concept"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notities"
@@ -1262,7 +1137,7 @@ msgid "Stock Move"
msgstr "Voorraadmutatie"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr "Ongeldige actie!"
@@ -1364,7 +1239,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1454,18 +1329,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Inkooporderregel factuur maken"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Te factureren uitgaande producten"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1550,9 +1425,9 @@ msgid "Invoice"
msgstr "Factuur"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Bevestigde inkooporder naar factuur"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1632,7 +1507,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1684,11 +1559,6 @@ msgid "Invoice Received"
msgstr "Factuur ontvangen"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr "Markeer als ongelezen"
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Factuurcontrole"
@@ -1750,6 +1620,11 @@ msgid "Open Purchase Menu"
msgstr "Inkoop menu openen"
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1819,10 +1694,10 @@ msgid "Purchase Order"
msgstr "Inkooporder"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1867,7 +1742,7 @@ msgid "# of Purchase Order"
msgstr "# inkoopporderBeheer"
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr "Inkomende levering <b>ontvangen</>"
@@ -1883,13 +1758,6 @@ msgid "Resend Purchase Order"
msgstr "InkoopporderBeheer opnieuw verzenden"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Netto-prijs"
@@ -1913,11 +1781,6 @@ msgid "Based on receptions"
msgstr "Gebaseerd op ontvangsten (geleverde hoeveelheid)"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fout ! U kunt geen recursieve bedrijven maken."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Leverancier referentie"
@@ -1955,11 +1818,6 @@ msgid "Invoice Lines"
msgstr "Factuurregels"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr "Markeer als gelezen"
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1976,7 +1834,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "Offerte_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -1997,11 +1855,11 @@ msgid "Configuration"
msgstr "Instellingen"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2017,6 +1875,11 @@ msgid "Reference Unit of Measure"
msgstr "Maateenheid referentie"
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Te factureren uitgaande producten"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2121,13 +1984,6 @@ msgid "January"
msgstr "Januari"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-"Het is niet mogelijk om producten te verplaatsen naar een locatie van het "
-"type 'weergave'"
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2165,6 +2021,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totaal oprders op gebruiker per maand"
@@ -2175,6 +2114,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2183,7 +2128,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2280,12 +2225,6 @@ msgid "Pricelist Versions"
msgstr "Versies prijslijsten"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Inkooporders welke zich de concept fase bevinden"
@@ -2691,12 +2630,12 @@ msgstr "Orders"
#~ msgid "purchase.installer"
#~ msgstr "purchase.installer"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fout ! U kunt geen recursieve bedrijven maken."
+
#~ msgid "State"
#~ msgstr "Status"
-#~ msgid "Print"
-#~ msgstr "Afdrukken"
-
#~ msgid ""
#~ "From Order: a draft invoice will be pre-generated based on the purchase "
#~ "order. The accountant will just have to validate this invoice for control.\n"
@@ -3007,9 +2946,15 @@ msgstr "Orders"
#~ msgid "Month-1"
#~ msgstr "Maand-1"
+#~ msgid "The company name must be unique !"
+#~ msgstr "De naam van het bedrijf moet uniek zijn!"
+
#~ msgid "UoM Categories"
#~ msgstr "Maateenheid categorieën"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referentie moet uniek zijn per bedrijf!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Inkomende leveringen beschikbaar"
@@ -3054,6 +2999,10 @@ msgstr "Orders"
#~ msgid "Back Orders"
#~ msgstr "Back Orders"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr ""
+#~ "Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
+
#, python-format
#~ msgid "Selected UOM does not belong to the same category as the product UOM"
#~ msgstr ""
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 3c8d5660bde..26ee17f71a2 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-01 11:28+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standaard aankoopprijslijst"
@@ -143,6 +60,11 @@ msgstr ""
"de gekozen producten / hoeveelheden wordt hiermee berekend."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "U moet eerst alle ontvangsten voor deze aankooporder annuleren."
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Gemiddelde prijs"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"aankooporderlijnen."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Te factureren aankooporders"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -423,17 +345,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgstr ""
"Een ontvangstnota wordt gemaakt om de binnenkomende producten op te volgen."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "De referentie moet uniek zijn."
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Hoeveelheid"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr "Journaal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Aankooporders met nog niet gefactureerde lijnen."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "De firmanaam moet uniek zijn"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr "Aankoopdoorlooptijd"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Geeft aan dat de ontvangst is gebeurd."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"als de prestaties van uw leverancier."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Afdrukken"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr "Voorraadbewegingen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr "Productcategorieën"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Geeft aan dat de factuur is betaald."
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Hvh"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr "Datum goedk."
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Orders van het jaar"
@@ -1112,11 +990,11 @@ msgstr ""
"bevestigd aankooporder."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Aankoopdashboard"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Terugzetten naar concept"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Opmerkingen"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Voorraadbeweging"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1447,18 +1325,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Factuur maken van aankooporderlijnen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "AO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Te factureren uitgaande producten"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1543,9 +1421,9 @@ msgid "Invoice"
msgstr "Factuur"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Te factureren aankooporders"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1625,7 +1503,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1677,11 +1555,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Factuurcontrole"
@@ -1743,6 +1616,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1811,10 +1689,10 @@ msgid "Purchase Order"
msgstr "Aankooporder"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1859,7 +1737,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1875,13 +1753,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Nettoprijs"
@@ -1905,11 +1776,6 @@ msgid "Based on receptions"
msgstr "Op basis van ontvangsten"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "U kunt niet dezelfde bedrijven maken."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Leveranciersreferentie"
@@ -1947,11 +1813,6 @@ msgid "Invoice Lines"
msgstr "Factuurlijnen"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1968,7 +1829,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De gekozen leverancier verkoopt dit product enkel per %s"
@@ -1989,11 +1850,11 @@ msgid "Configuration"
msgstr "Instellingen"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2009,6 +1870,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Te factureren uitgaande producten"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2113,11 +1979,6 @@ msgid "January"
msgstr "Januari"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2155,6 +2016,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totaal aantal orders per gebruiker per maand"
@@ -2165,6 +2109,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2173,7 +2123,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2269,11 +2219,6 @@ msgid "Pricelist Versions"
msgstr "Prijslijstversies"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "U kunt niet dezelfde verenigingsleden maken."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Aankooporders in conceptstatus"
@@ -2453,12 +2398,12 @@ msgstr "Bestellingen"
#~ msgid "Wrong Product UOM !"
#~ msgstr "Verkeerde producteenheid"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "U kunt niet dezelfde bedrijven maken."
+
#~ msgid "State"
#~ msgstr "Status"
-#~ msgid "Print"
-#~ msgstr "Afdrukken"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Geen relatie"
@@ -2873,6 +2818,9 @@ msgstr "Bestellingen"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Vooraf conceptfacturen maken volgens aankooporders"
+#~ msgid "The company name must be unique !"
+#~ msgstr "De firmanaam moet uniek zijn"
+
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Volgens aankooporderlijnen"
@@ -2903,6 +2851,9 @@ msgstr "Bestellingen"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Kan aankooporder niet annuleren"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "De referentie moet uniek zijn."
+
#~ msgid ""
#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
@@ -2954,6 +2905,9 @@ msgstr "Bestellingen"
#~ msgid "Back Orders"
#~ msgstr "Backorders"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "U kunt niet dezelfde verenigingsleden maken."
+
#~ msgid ""
#~ "\n"
#~ "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 35b3ced178e..ab2bb4a98bf 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-11-07 12:53+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Domyślny cennik zakupów"
@@ -143,6 +60,11 @@ msgstr ""
"jest obliczana z tego cennika."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Musisz najpierw anulować wszystkie przyjęcia dla tego zamówienia."
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Cena przeciętna"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -312,15 +234,15 @@ msgstr ""
"zakupu."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Potwierdzone zamówienia zakupu do zafakturowania"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -354,7 +276,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -423,17 +345,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Październik"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -449,12 +366,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Pobranie jest generowane do śledzenie a przyjęć prduktów"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Odnośnik musi być unikalny w firmie!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -475,7 +386,7 @@ msgid "Quantity"
msgstr "Ilość"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -538,7 +449,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -569,13 +480,6 @@ msgid "Journal"
msgstr "Dziennik"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -592,11 +496,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Zamówienia zakupu z pozycjami niezafakturowanymi"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Nazwa firmy musi być unikalna !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -620,11 +519,6 @@ msgid "Purchase Lead Time"
msgstr "Czas na zakup"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -679,7 +573,7 @@ msgid "Supplier"
msgstr "Dostawca"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -772,8 +666,8 @@ msgid "It indicates that a picking has been done"
msgstr "To oznacza, że pobranie zostało wykonane"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -793,10 +687,9 @@ msgstr ""
"zakupu i postęp w dostawach od dostawców."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazyn"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Drukuj"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -901,7 +794,7 @@ msgid "Stock Moves"
msgstr "Przesunięcia zapasów"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -912,11 +805,6 @@ msgid "Product Categories"
msgstr "Kategorie produktów"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "To oznacza, że faktura została zapłacona"
@@ -1015,11 +903,6 @@ msgid "Qty"
msgstr "Il."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1069,7 +952,7 @@ msgid "Date Approved"
msgstr "Data aprobowania"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1080,11 +963,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Zamówienia z roku"
@@ -1111,11 +989,11 @@ msgstr ""
"potwierdzonym zamówieniem zakupu."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1124,12 +1002,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1141,7 +1024,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1160,7 +1043,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1171,7 +1054,7 @@ msgid "Purchase Dashboard"
msgstr "Konsola zakupów"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1220,11 +1103,6 @@ msgid "Set to Draft"
msgstr "Ustaw na projekt"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Uwagi"
@@ -1254,7 +1132,7 @@ msgid "Stock Move"
msgstr "Przesunięcie zapasu"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1356,7 +1234,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1446,18 +1324,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Pozycja zamówienia zakupu tworzy fakturę"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "ZZ: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Wydawane produkty do zafakturowania"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1542,9 +1420,9 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Potwierdzone zamówienia zakupu do zafakturowania"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1624,7 +1502,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1676,11 +1554,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Wystawianie faktur"
@@ -1742,6 +1615,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1810,10 +1688,10 @@ msgid "Purchase Order"
msgstr "Zamówienie zakupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1858,7 +1736,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1874,13 +1752,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Cena netto"
@@ -1904,11 +1775,6 @@ msgid "Based on receptions"
msgstr "Na podstawie przyjęć"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Odnośnik dostawcy"
@@ -1945,11 +1811,6 @@ msgid "Invoice Lines"
msgstr "Pozycje faktury"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1965,7 +1826,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -1986,11 +1847,11 @@ msgid "Configuration"
msgstr "Konfiguracja"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2006,6 +1867,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Wydawane produkty do zafakturowania"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2110,11 +1976,6 @@ msgid "January"
msgstr "Styczeń"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2152,6 +2013,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Suma zamówień na użytkownika na miesiąc"
@@ -2162,6 +2106,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazyn"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2170,7 +2120,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2266,11 +2216,6 @@ msgid "Pricelist Versions"
msgstr "Wersje cennika"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych obiektów."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Zamówienia zakupu w stanie Projekt"
@@ -2726,9 +2671,6 @@ msgstr "Zamówienia"
#~ msgid "State"
#~ msgstr "Stan"
-#~ msgid "Print"
-#~ msgstr "Drukuj"
-
#~ msgid "Address Contact Name"
#~ msgstr "Nazwa kontaktu adresu"
@@ -2891,6 +2833,9 @@ msgstr "Zamówienia"
#~ msgid "Reference UoM"
#~ msgstr "JM"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
#~ msgid ""
#~ "You can create a request for quotation when you want to buy products to a "
#~ "supplier but the purchase is not confirmed yet. Use also this menu to review "
@@ -3036,6 +2981,12 @@ msgstr "Zamówienia"
#~ msgid "Order in current month"
#~ msgstr "Zamówienia w bieżącym miesiącu"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Nazwa firmy musi być unikalna !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Odnośnik musi być unikalny w firmie!"
+
#~ msgid "UoM Categories"
#~ msgstr "Kategorie JM"
@@ -3061,6 +3012,9 @@ msgstr "Zamówienia"
#~ msgid "Back Orders"
#~ msgstr "Pobranie częściowe"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych obiektów."
+
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Projekty faktur wygenerowane z zamówień zakupu"
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 07795d1d76e..709b0de7264 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:34+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Lista de preços de compra padrão."
@@ -143,6 +60,11 @@ msgstr ""
"processa o preço do fornecedor para os artigos e quantidades selecionados."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -237,7 +159,7 @@ msgid "Average Price"
msgstr "Preço médio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -314,15 +236,15 @@ msgstr ""
"de ordens de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Ordens de compra confirmadas, por faturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -356,7 +278,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -425,17 +347,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Outubro"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -451,12 +368,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "A lista de pick é gerada para acompanhar os artigos de entrada."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "A referência deve ser única por empresa!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -477,7 +388,7 @@ msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -540,7 +451,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -571,13 +482,6 @@ msgid "Journal"
msgstr "Diário"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -594,11 +498,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Ordens de compra, que incluem linhas não faturadas."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -622,11 +521,6 @@ msgid "Purchase Lead Time"
msgstr "Prazo de entrega das compras"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -681,7 +575,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -774,8 +668,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que a recepção foi concluída"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -795,10 +689,9 @@ msgstr ""
"entregas dos fornecedores."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -903,7 +796,7 @@ msgid "Stock Moves"
msgstr "Movimentos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -914,11 +807,6 @@ msgid "Product Categories"
msgstr "Categorias do Artigo"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indica que a fatura foi paga."
@@ -1017,11 +905,6 @@ msgid "Qty"
msgstr "Qtd"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1071,7 +954,7 @@ msgid "Date Approved"
msgstr "Data de Aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1082,11 +965,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Ordem do ano"
@@ -1113,11 +991,11 @@ msgstr ""
"confirmada."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1126,12 +1004,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1143,7 +1026,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1162,7 +1045,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1173,7 +1056,7 @@ msgid "Purchase Dashboard"
msgstr "Painel de controlo da compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1222,11 +1105,6 @@ msgid "Set to Draft"
msgstr "Definir como Rascunho"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1256,7 +1134,7 @@ msgid "Stock Move"
msgstr "Movimento do Stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1358,7 +1236,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1448,18 +1326,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Linha Ordem de Compra Faça Fatura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Artigos em expedição, por faturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1544,9 +1422,9 @@ msgid "Invoice"
msgstr "Fatura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Ordens de compra confirmadas, por faturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1626,7 +1504,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1678,11 +1556,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Controlo de faturação"
@@ -1744,6 +1617,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1813,10 +1691,10 @@ msgid "Purchase Order"
msgstr "Ordem de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1860,7 +1738,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1876,13 +1754,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Preço Líquido"
@@ -1906,11 +1777,6 @@ msgid "Based on receptions"
msgstr "Baseadas nas recepções"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivas"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Código do fornecedor"
@@ -1948,11 +1814,6 @@ msgid "Invoice Lines"
msgstr "Linhas da Fatura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1969,7 +1830,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado só vende este artigo %s"
@@ -1990,11 +1851,11 @@ msgid "Configuration"
msgstr "Configuração"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2010,6 +1871,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Artigos em expedição, por faturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2114,11 +1980,6 @@ msgid "January"
msgstr "Janeiro"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2156,6 +2017,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total de ordens por utilizador e por mês"
@@ -2166,6 +2110,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2174,7 +2124,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2271,11 +2221,6 @@ msgid "Pricelist Versions"
msgstr "Versões da Lista de Preços"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Não pode criar membros recursivos."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ordens de compra que estão em estado de rascunho"
@@ -2625,9 +2570,6 @@ msgstr "Ordens"
#~ msgid "State"
#~ msgstr "Estado"
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
#~ msgid "You cannot have 2 pricelist versions that overlap!"
#~ msgstr "Não pode ter duas versões de listas de preços que se sobreponham."
@@ -2759,6 +2701,9 @@ msgstr "Ordens"
#~ msgid "Purchase Analytic Plans"
#~ msgstr "Planos de compras analíticas"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erro! Não pode criar empresas recursivas"
+
#~ msgid ""
#~ "From Order: a draft invoice will be pre-generated based on the purchase "
#~ "order. The accountant will just have to validate this invoice for control.\n"
@@ -2906,6 +2851,9 @@ msgstr "Ordens"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Baseado em linhas da ordem de compras"
+#~ msgid "The company name must be unique !"
+#~ msgstr "O nome da empresa deve ser único!"
+
#~ msgid "UoM Categories"
#~ msgstr "Categorias UdM"
@@ -2917,6 +2865,9 @@ msgstr "Ordens"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Não é possível cancelar esta ordem de compra!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "A referência deve ser única por empresa!"
+
#~ msgid ""
#~ "Create or Import Suppliers and their contacts manually from this form or you "
#~ "can import your existing partners by CSV spreadsheet from \"Import Data\" "
@@ -2960,6 +2911,9 @@ msgstr "Ordens"
#~ msgid "Default Invoicing Control Method"
#~ msgstr "Método padrão do controlo de faturamento"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Erro! Não pode criar membros recursivos."
+
#~ msgid "Invoiced & Paid"
#~ msgstr "Faturado & Pago"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index ce73005ff8b..e94aa826259 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-09-16 11:51+0000\n"
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
"<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -43,89 +43,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Lista de Preço de Compras Padrão"
@@ -145,6 +62,11 @@ msgstr ""
"calcula o preço do fornecedor para os produtos/quantidades selecionadas."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -185,16 +107,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -239,7 +161,7 @@ msgid "Average Price"
msgstr "Preço Médio"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -316,15 +238,15 @@ msgstr ""
"linhas do Pedido de compra '."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Confirmado Pedido de Compra para Faturar"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -358,7 +280,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -427,17 +349,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Outubro"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -454,12 +371,6 @@ msgstr ""
"Uma Lista de Separação foi gerada para rastrear a entrada de produtos."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "A referência deve ser única por empresa!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -480,7 +391,7 @@ msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -543,7 +454,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -574,13 +485,6 @@ msgid "Journal"
msgstr "Diário"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -597,11 +501,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Pedidos de compra com linhas não faturadas"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -625,11 +524,6 @@ msgid "Purchase Lead Time"
msgstr "Prazo de Compras"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -684,7 +578,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -777,8 +671,8 @@ msgid "It indicates that a picking has been done"
msgstr "Isso indica que a Separação foi Feita"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -799,10 +693,9 @@ msgstr ""
"fornecedores."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Estoque"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -907,7 +800,7 @@ msgid "Stock Moves"
msgstr "Movimentação de Estoque"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -918,11 +811,6 @@ msgid "Product Categories"
msgstr "Categorias de Produtos"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Isso indica que a Fatura foi Paga"
@@ -1021,11 +909,6 @@ msgid "Qty"
msgstr "Qtd"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1075,7 +958,7 @@ msgid "Date Approved"
msgstr "Data da Aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1086,11 +969,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Pedidos do Ano"
@@ -1117,11 +995,11 @@ msgstr ""
"compra confirmado."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1130,12 +1008,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1147,7 +1030,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1166,7 +1049,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1177,7 +1060,7 @@ msgid "Purchase Dashboard"
msgstr "Painel de Compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1226,11 +1109,6 @@ msgid "Set to Draft"
msgstr "Definir como Provisório"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Observações"
@@ -1260,7 +1138,7 @@ msgid "Stock Move"
msgstr "Mov. de Estoque"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1362,7 +1240,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1452,18 +1330,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Faturar Linha Pedido de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Saida Produtos a Faturar"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1548,9 +1426,9 @@ msgid "Invoice"
msgstr "Nota Fiscal"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Confirmado Pedido de Compra para Faturar"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1630,7 +1508,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1682,11 +1560,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Controle Faturamento"
@@ -1748,6 +1621,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1817,10 +1695,10 @@ msgid "Purchase Order"
msgstr "Pedido de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1865,7 +1743,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1881,13 +1759,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Preço Líquido"
@@ -1911,11 +1782,6 @@ msgid "Based on receptions"
msgstr "Baseado em recebimentos"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Ref. Fornecedor"
@@ -1953,11 +1819,6 @@ msgid "Invoice Lines"
msgstr "Linhas da Fatura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1975,7 +1836,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -1996,11 +1857,11 @@ msgid "Configuration"
msgstr "Configuração"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2016,6 +1877,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Saida Produtos a Faturar"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2120,11 +1986,6 @@ msgid "January"
msgstr "Janeiro"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2162,6 +2023,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total de Pedidos por Usuário por Mês"
@@ -2172,6 +2116,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Estoque"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2180,7 +2130,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2277,11 +2227,6 @@ msgid "Pricelist Versions"
msgstr "Versões da lista"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de Compra que estão como Provisórios"
@@ -2737,8 +2682,8 @@ msgstr "Pedidos"
#~ msgid " Month "
#~ msgstr " Mês "
-#~ msgid "Print"
-#~ msgstr "Imprimir"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erro! Você não pode criar empresas recursivas"
#, python-format
#~ msgid "Warning"
@@ -3046,9 +2991,15 @@ msgstr "Pedidos"
#~ msgid "Month-1"
#~ msgstr "Mês-1"
+#~ msgid "The company name must be unique !"
+#~ msgstr "O nome da empresa deve ser único !"
+
#~ msgid "UoM Categories"
#~ msgstr "Categorias UoM"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "A referência deve ser única por empresa!"
+
#, python-format
#~ msgid "In order to delete a purchase order, it must be cancelled first!"
#~ msgstr "Um pedido de compra deve ser cancelado antes de ser apagado!"
@@ -3172,6 +3123,9 @@ msgstr "Pedidos"
#~ msgid "Back Orders"
#~ msgstr "Pedidos Devolvidos"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Erro! Você não pode criar recursivamente a membros associados."
+
#~ msgid ""
#~ "This tool will help you to select the method you want to use to control "
#~ "supplier invoices."
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index ec7dfa2400c..849a7b7c3f5 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-01-29 16:12+0000\n"
"Last-Translator: Dorin <dhongu@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Lista de preturi implicita de achizitii"
@@ -144,6 +61,11 @@ msgstr ""
"produsele/cantitatile selectate."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -238,7 +160,7 @@ msgid "Average Price"
msgstr "Pret mediu"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -315,15 +237,15 @@ msgstr ""
"comenzilor de achizitie a produselor."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Comanda de achizitionare confirmata pentru facturare"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -357,7 +279,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -427,17 +349,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Octombrie"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -453,12 +370,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "O lista de preluare este generata pentru a urmari produsele primite."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Referinta trebuie sa fie unica per Companie!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -479,7 +390,7 @@ msgid "Quantity"
msgstr "Cantitate"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -542,7 +453,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -573,13 +484,6 @@ msgid "Journal"
msgstr "Jurnal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -596,11 +500,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Comenzi de achizitie care includ linii nefacturate."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Numele companiei trebuie să fie unic !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -624,11 +523,6 @@ msgid "Purchase Lead Time"
msgstr "Interval de aprovizioanre"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -683,7 +577,7 @@ msgid "Supplier"
msgstr "Furnizor"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -776,8 +670,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica faptul ca a fost efectuata o ridicare"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -798,10 +692,9 @@ msgstr ""
"dumneavoastra."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depozit"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Printeaza"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -906,7 +799,7 @@ msgid "Stock Moves"
msgstr "Miscari stoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -917,11 +810,6 @@ msgid "Product Categories"
msgstr "Categorii Produse"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Indiaă faptul ca o factura a fost platita"
@@ -1022,11 +910,6 @@ msgid "Qty"
msgstr "Cantitate"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1076,7 +959,7 @@ msgid "Date Approved"
msgstr "Data aprobata"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1087,11 +970,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Comanda din An"
@@ -1118,11 +996,11 @@ msgstr ""
"de cotatie devine o Comanda de achizitie confirmata."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1131,12 +1009,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1148,7 +1031,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1167,7 +1050,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1178,7 +1061,7 @@ msgid "Purchase Dashboard"
msgstr "Panou de bord Achizitii"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1227,11 +1110,6 @@ msgid "Set to Draft"
msgstr "Seteaza ca ciorna"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Note"
@@ -1261,7 +1139,7 @@ msgid "Stock Move"
msgstr "Miscare stoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1363,7 +1241,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1453,18 +1331,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Linie comanda de achizitii Faceti factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Facturare produse iesite"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1549,9 +1427,9 @@ msgid "Invoice"
msgstr "Factura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Comanda de achizitionare confirmata pentru facturare"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1631,7 +1509,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1683,11 +1561,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Control facturare"
@@ -1749,6 +1622,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1818,10 +1696,10 @@ msgid "Purchase Order"
msgstr "Comanda de aprovizionare"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1866,7 +1744,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1882,13 +1760,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Pret Net"
@@ -1912,11 +1783,6 @@ msgid "Based on receptions"
msgstr "Pe baza primirilor"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Eroare! Nu puteti crea companii recursive."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Referintă furnizor"
@@ -1954,11 +1820,6 @@ msgid "Invoice Lines"
msgstr "Pozitii factura"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1976,7 +1837,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Furnizorul selectat vinde acest produs doar după %s"
@@ -1997,11 +1858,11 @@ msgid "Configuration"
msgstr "Configurare"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2017,6 +1878,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Facturare produse iesite"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2121,11 +1987,6 @@ msgid "January"
msgstr "Ianuarie"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2163,6 +2024,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total Comenzi după Utilizator pe luna"
@@ -2173,6 +2117,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depozit"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2181,7 +2131,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2279,11 +2229,6 @@ msgid "Pricelist Versions"
msgstr "Versiuni ale Listei de preturi"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Comenzi de achizitie care se afla in starea ciorna"
@@ -2448,6 +2393,9 @@ msgstr "Comenzi"
#~ msgid "Wrong Product UOM !"
#~ msgstr "UdM a produsului greșită!"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Eroare! Nu puteti crea companii recursive."
+
#~ msgid "Receptions"
#~ msgstr "Primiri"
@@ -2718,9 +2666,6 @@ msgstr "Comenzi"
#~ msgid "Available"
#~ msgstr "Disponibil(ă)"
-#~ msgid "Print"
-#~ msgstr "Printeaza"
-
#~ msgid "Create or Import Suppliers"
#~ msgstr "Creeaza sau Importa Furnizori"
@@ -2790,6 +2735,9 @@ msgstr "Comenzi"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Facturi ciorna pre-generate pe baza Comenzilor de achizitie"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Numele companiei trebuie să fie unic !"
+
#~ msgid "Destination Address"
#~ msgstr "Adresa destinatie"
@@ -2825,6 +2773,9 @@ msgstr "Comenzi"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Aceasta comanda de achizitie nu a putut fi anulata!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referinta trebuie sa fie unica per Companie!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Livrarile primite disponibile"
@@ -2981,6 +2932,9 @@ msgstr "Comenzi"
#~ "Nu exista nici un cont de cheltuieli definit pentru acest produs: \"%s\" "
#~ "(id:%d)"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
+
#~ msgid "res_config_contents"
#~ msgstr "res_config_continuturi"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 84e9c357b46..e361dd3085f 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-29 13:12+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Прайс-лист закупок по умолчанию"
@@ -143,6 +60,11 @@ msgstr ""
"рассчитывается цена поставщика для выбранной продукции / количества."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -185,16 +107,16 @@ msgstr ""
"html для возможности использования в канбан виде"
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr "Внимание!"
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -239,7 +161,7 @@ msgid "Average Price"
msgstr "Средняя цена"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr "Счет <b>оплачен</b>."
@@ -316,15 +238,15 @@ msgstr ""
"Вычислено, как ближайшая запланированная дата из всех позиций заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Для того, чтобы удалить заказ, сначала вы должны отменить его."
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Подтвержденный заказ закупки в счет"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr "При продаже этого товара, OpenERP вызовет"
#. module: purchase
#: view:purchase.order:0
@@ -358,7 +280,7 @@ msgid "Quotation "
msgstr "Предложение "
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -427,17 +349,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr "Вы должны присвоить порядковый номер для этого товара."
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Октябрь"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr "Заказ закупки для <em>%s</em> <b>отменен</b>."
@@ -453,12 +370,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Комплектовочный лист создан для отслеживания входящих ТМЦ."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Ссылка должна быть уникальна для каждой компании!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -479,7 +390,7 @@ msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr "Отгрузка <em>%s</em> <b>запланирована</b> на %s."
@@ -544,7 +455,7 @@ msgstr ""
"Иначе, оставьте пустым для доставки в вашу компанию."
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr "Черновик счета %s %s <b>ожидает утверждения</b>."
@@ -575,15 +486,6 @@ msgid "Journal"
msgstr "Журнал"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-"Ошибка: единицы измерения по умолчанию и единицы измерения закупки должны "
-"быть одной категории."
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -600,11 +502,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Заказы закупки, которые имеют позиции не указанные в счетах."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Название компании должно быть уникальным!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -628,11 +525,6 @@ msgid "Purchase Lead Time"
msgstr "Запас по времени на закупку"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неверный штрих-код"
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -687,7 +579,7 @@ msgid "Supplier"
msgstr "Поставщик"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Определить счет расходов для этой компании: \"%s\" (id:%d)."
@@ -780,8 +672,8 @@ msgid "It indicates that a picking has been done"
msgstr "Показывает, что комплектование выполнено."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Не удалось отменить это заказ."
@@ -801,10 +693,9 @@ msgstr ""
"ТМЦ и исполнение доставок от поставщика."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Печать"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -911,7 +802,7 @@ msgid "Stock Moves"
msgstr "Движение ТМЦ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr "Черновик заказа закупки создан"
@@ -922,11 +813,6 @@ msgid "Product Categories"
msgstr "Категории ТМЦ"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr "Отправить запрос цен"
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Показывает, что счет был оплачен"
@@ -1025,11 +911,6 @@ msgid "Qty"
msgstr "Кол-во"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr "Адреса в заказах закупки"
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1079,7 +960,7 @@ msgid "Date Approved"
msgstr "Дата утверждения"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr "Запрос цен <b>создан</b>."
@@ -1090,11 +971,6 @@ msgid "a draft purchase order"
msgstr "черновик заказа закупки"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr "Вы пытаетесь присвоить партию другого товара."
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Заказ года"
@@ -1121,11 +997,11 @@ msgstr ""
"закупки."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1134,12 +1010,17 @@ msgid "Outgoing Mails"
msgstr "Исходящие письма"
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Вы не можете подтвердить заказ закупки без позиций заказа."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Сообщения и история общения"
@@ -1151,7 +1032,7 @@ msgid "Destination Warehouse"
msgstr "Склад назначения"
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1172,7 +1053,7 @@ msgid "Manage pricelist per supplier"
msgstr "Управление прайс-листом по поставщику"
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr "Заказ закупки установлен в <b>черновик</b>."
@@ -1183,7 +1064,7 @@ msgid "Purchase Dashboard"
msgstr "Панель закупок"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "Сначала отмените все приходы, связанные с этим заказом закупки."
@@ -1232,11 +1113,6 @@ msgid "Set to Draft"
msgstr "Установить в 'Черновик'"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr "Разрешить разные адреса для поступающих товаров и счетов"
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Примечания"
@@ -1266,7 +1142,7 @@ msgid "Stock Move"
msgstr "Перемещение ТМЦ"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr "Неверное действие!"
@@ -1370,7 +1246,7 @@ msgstr ""
" заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr "Пожалуйста, создайте счета"
@@ -1460,18 +1336,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Позиция заказа закупки - Создать счет"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "ЗЗ: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Исходящие ТМЦ в счет"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Определить журнал покупок для этой компании: \"%s\" (id:%d)."
@@ -1557,9 +1433,9 @@ msgid "Invoice"
msgstr "Счет"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr "При продаже этого товара, OpenERP вызовет"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Подтвержденный заказ закупки в счет"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1639,7 +1515,7 @@ msgid "Compute product cost price based on average cost"
msgstr "Вычислить себестоимость на основе средней стоимости"
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1691,11 +1567,6 @@ msgid "Invoice Received"
msgstr "Счет получен"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr "Непрочитано"
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Контроль счетов"
@@ -1757,6 +1628,11 @@ msgid "Open Purchase Menu"
msgstr "Открыть меню закупок"
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1826,10 +1702,10 @@ msgid "Purchase Order"
msgstr "Заказ закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1874,7 +1750,7 @@ msgid "# of Purchase Order"
msgstr "№ заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr "Партия <b>получена</b>."
@@ -1890,13 +1766,6 @@ msgid "Resend Purchase Order"
msgstr "Послать заказ закупки"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr "Позволяет задавать различные адреса в доставке и в счете по заказу."
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Цена до налогов"
@@ -1920,11 +1789,6 @@ msgid "Based on receptions"
msgstr "На основе поступлений"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Ошибка ! Нельзя создать рекурсивные компании."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Ссылка на поставщика"
@@ -1962,11 +1826,6 @@ msgid "Invoice Lines"
msgstr "Позиции счета"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr "Прочитано"
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1983,7 +1842,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -2004,11 +1863,11 @@ msgid "Configuration"
msgstr "Конфигурация"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2024,6 +1883,11 @@ msgid "Reference Unit of Measure"
msgstr "Базовая единица измерения"
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Исходящие ТМЦ в счет"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2128,11 +1992,6 @@ msgid "January"
msgstr "Январь"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr "Нельзя переместить товары из или в расположение типа вид."
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2172,6 +2031,89 @@ msgid "Invoicing Settings"
msgstr "Настройка счетов"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Всего заказов пользователя за месяц"
@@ -2182,6 +2124,12 @@ msgid "Based on incoming shipments"
msgstr "На основании поступающих грузов"
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2190,7 +2138,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2286,11 +2234,6 @@ msgid "Pricelist Versions"
msgstr "Версии прайс-листов"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Заказы закупки находящиеся в состоянии \"Черновик\""
@@ -2665,9 +2608,6 @@ msgstr "Заказы"
#~ msgid "State"
#~ msgstr "Состояние"
-#~ msgid "Print"
-#~ msgstr "Печать"
-
#~ msgid "Address Contact Name"
#~ msgstr "Адрес контакта"
@@ -2761,6 +2701,9 @@ msgstr "Заказы"
#~ msgid "Error ! You can not create recursive associated members."
#~ msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+
#~ msgid "You try to assign a lot which is not from the same product"
#~ msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
@@ -2968,6 +2911,9 @@ msgstr "Заказы"
#~ msgstr ""
#~ "Предварительное создание черновиков счетов основанных на заказах закупки"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Название компании должно быть уникальным!"
+
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "Основан на позициях заказа закупки"
@@ -2995,6 +2941,9 @@ msgstr "Заказы"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Не удалось отменить это заказ закупки !"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Ссылка должна быть уникальна для каждой компании!"
+
#~ msgid "Incoming Shipments Available"
#~ msgstr "Поступающие грузы, доступные к обработке"
@@ -3214,6 +3163,9 @@ msgstr "Заказы"
#~ "Вы должны выбрать прайс-лист или поставщика в форме ввода закупки !\n"
#~ "Пожалуйста выберите, перед выбором ТМЦ."
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
+
#~ msgid "Order in current year"
#~ msgstr "Заказ в текущем году"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index 77e55ae0299..cfe7d868390 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-02-21 09:22+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovak <sk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Predvolený cenník nákupu"
@@ -142,6 +59,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr "Množstvo"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr "Dodávateľ"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,9 +674,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
msgstr ""
#. module: purchase
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr "Nastaviť ako návr"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index abb946dba39..9fb239ca82d 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2010-12-16 05:34+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Privzeti nabavni cenik"
@@ -143,6 +60,11 @@ msgstr ""
"dobaviteljevo ceno za izbrane proizvode/količine."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -235,7 +157,7 @@ msgid "Average Price"
msgstr "Povprečna cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -311,15 +233,15 @@ msgstr ""
"To se izračuna kot minimalni pričakovani datum vseh naročil artiklov."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Potrjen nakup za fakturo"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -353,7 +275,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -419,17 +341,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -445,12 +362,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Izbirni seznam je ustvarjen za sledenje uvoženih artiklov."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -471,7 +382,7 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -534,7 +445,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -565,13 +476,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -588,11 +492,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -616,11 +515,6 @@ msgid "Purchase Lead Time"
msgstr "Čas dostave naročila"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -670,7 +564,7 @@ msgid "Supplier"
msgstr "Dobavitelj"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -763,8 +657,8 @@ msgid "It indicates that a picking has been done"
msgstr "Pokaže da je bilo izbiranje končano"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -784,10 +678,9 @@ msgstr ""
"sprejeme v podjetju in izvajanje nakupov vašega naročnika."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladišče"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Natisni"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -892,7 +785,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -903,11 +796,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "To pomeni, da je bila faktura plačana"
@@ -1006,11 +894,6 @@ msgid "Qty"
msgstr "Kol."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1060,7 +943,7 @@ msgid "Date Approved"
msgstr "Odobreno dne"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1071,11 +954,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1101,11 +979,11 @@ msgstr ""
"ročno in ga potrdi. Povpraševanje postane Potrjeno naročilo."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1114,12 +992,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1131,7 +1014,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1150,7 +1033,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1161,7 +1044,7 @@ msgid "Purchase Dashboard"
msgstr "Nadzorna plošča za nakup"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1210,11 +1093,6 @@ msgid "Set to Draft"
msgstr "Preklopi v pripravo"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Opombe"
@@ -1244,7 +1122,7 @@ msgid "Stock Move"
msgstr "Prenos zaloge"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1346,7 +1224,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1436,18 +1314,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Naročilo naj naredi račun"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Odhodni artikli na računu"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1532,9 +1410,9 @@ msgid "Invoice"
msgstr "Račun"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Potrjen nakup za fakturo"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1614,7 +1492,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1666,11 +1544,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Nadzor zaračunavanja"
@@ -1732,6 +1605,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1801,10 +1679,10 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1846,7 +1724,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1862,13 +1740,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Neto cena"
@@ -1892,11 +1763,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Napaka! Ne morete ustvariti rekurzivnih podjetij."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Sklic Dobavitelja"
@@ -1931,11 +1797,6 @@ msgid "Invoice Lines"
msgstr "Postavke računa"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1952,7 +1813,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Izbrani dobavitelj prodaja le ta artikel z %s"
@@ -1973,11 +1834,11 @@ msgid "Configuration"
msgstr "Nastavitve"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1993,6 +1854,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Odhodni artikli na računu"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2097,11 +1963,6 @@ msgid "January"
msgstr "Januar"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2139,6 +2000,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Skupna naročila za uporabnika na mesec"
@@ -2149,6 +2093,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladišče"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2157,7 +2107,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2251,11 +2201,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2511,12 +2456,12 @@ msgstr "Naročila"
#~ msgid "purchase.installer"
#~ msgstr "nameščanje.nabave"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Napaka! Ne morete ustvariti rekurzivnih podjetij."
+
#~ msgid "State"
#~ msgstr "Država"
-#~ msgid "Print"
-#~ msgstr "Natisni"
-
#~ msgid "General Information"
#~ msgstr "Splošne informacije"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index b01cb1f77b6..98cde501dab 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2010-08-10 10:20+0000\n"
"Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -142,6 +59,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,9 +674,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
msgstr ""
#. module: purchase
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 748aff3ef30..77629ad5285 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:56+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: Serbian <sr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standardni nabavni cenovnik"
@@ -144,6 +61,11 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,14 +235,14 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -421,17 +343,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -447,12 +364,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -473,7 +384,7 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -536,7 +447,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -567,13 +478,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -590,11 +494,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -618,11 +517,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -672,7 +566,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -765,8 +659,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -784,10 +678,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -892,7 +785,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -903,11 +796,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1006,11 +894,6 @@ msgid "Qty"
msgstr "Količina"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1060,7 +943,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1071,11 +954,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1099,11 +977,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1112,12 +990,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1129,7 +1012,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1148,7 +1031,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1159,7 +1042,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1208,11 +1091,6 @@ msgid "Set to Draft"
msgstr "Postavi u 'Pripremu'"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1242,7 +1120,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1341,7 +1219,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1431,18 +1309,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1527,8 +1405,8 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1609,7 +1487,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1661,11 +1539,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Kontrola fakturisanja"
@@ -1727,6 +1600,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1796,10 +1674,10 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1841,7 +1719,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1857,13 +1735,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Neto cijena"
@@ -1887,11 +1758,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1926,11 +1792,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1944,7 +1805,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1965,11 +1826,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1985,6 +1846,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2089,11 +1955,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2131,6 +1992,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2141,6 +2085,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2149,7 +2099,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2233,11 +2183,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index a4b2b294004..7307cf94b96 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:36+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standardni nabavni cenovnik"
@@ -144,6 +61,11 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,14 +235,14 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -421,17 +343,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -447,12 +364,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -473,7 +384,7 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -536,7 +447,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -567,13 +478,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -590,11 +494,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -618,11 +517,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -672,7 +566,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -765,8 +659,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -784,10 +678,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -892,7 +785,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -903,11 +796,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1006,11 +894,6 @@ msgid "Qty"
msgstr "Količina"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1060,7 +943,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1071,11 +954,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1099,11 +977,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1112,12 +990,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1129,7 +1012,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1148,7 +1031,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1159,7 +1042,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1208,11 +1091,6 @@ msgid "Set to Draft"
msgstr "Postavi u 'Pripremu'"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1242,7 +1120,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1341,7 +1219,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1431,18 +1309,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1527,8 +1405,8 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1609,7 +1487,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1661,11 +1539,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Kontrola fakturisanja"
@@ -1727,6 +1600,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1796,10 +1674,10 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1841,7 +1719,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1857,13 +1735,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Neto cijena"
@@ -1887,11 +1758,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1926,11 +1792,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1944,7 +1805,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1965,11 +1826,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1985,6 +1846,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2089,11 +1955,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2131,6 +1992,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2141,6 +2085,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2149,7 +2099,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2233,11 +2183,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index b6377d94046..fca89be609c 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-06-26 07:07+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Standardinköpslista"
@@ -143,6 +60,11 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -183,16 +105,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Snittpris"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Bekräftade inköpsorder att fakturera"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "En plocklista genereras för att spåra inkommande produkter."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Referensen måste vara unik per bolag!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Kvantitet"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr "Journal"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "Beställningar som inkluderar rader som inte är fakturerade."
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Bolagsnamnet måste vara unikt !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr "Leverantörens ledtid"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Leverantör"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Anger att plockningen är klar."
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -794,10 +688,9 @@ msgstr ""
"ordermottagningar och resultatet för dina leverantörens leveranser."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lagerhus"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Skriv ut"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -902,7 +795,7 @@ msgid "Stock Moves"
msgstr "Stock Moves"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -913,11 +806,6 @@ msgid "Product Categories"
msgstr "Produktkategorier"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Anger att en faktura är betald."
@@ -1016,11 +904,6 @@ msgid "Qty"
msgstr "Qty"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1070,7 +953,7 @@ msgid "Date Approved"
msgstr "Datum godkänd"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1081,11 +964,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Ordrar i år"
@@ -1112,11 +990,11 @@ msgstr ""
"Inköpsorder."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1125,12 +1003,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1142,7 +1025,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1161,7 +1044,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1172,7 +1055,7 @@ msgid "Purchase Dashboard"
msgstr "Inköpsinfopanel"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1221,11 +1104,6 @@ msgid "Set to Draft"
msgstr "Set to Draft"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Anteckningar"
@@ -1255,7 +1133,7 @@ msgid "Stock Move"
msgstr "Lagertransaktion"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1357,7 +1235,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1447,18 +1325,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Inköpsorderrader Tillverka Faktura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Utlevererade produkter att fakturera"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1543,9 +1421,9 @@ msgid "Invoice"
msgstr "Faktura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Bekräftade inköpsorder att fakturera"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1625,7 +1503,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1677,11 +1555,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Invoicing Control"
@@ -1743,6 +1616,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1812,10 +1690,10 @@ msgid "Purchase Order"
msgstr "Inköpsorder"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1859,7 +1737,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1875,13 +1753,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Net Price"
@@ -1905,11 +1776,6 @@ msgid "Based on receptions"
msgstr "Baserad på mottagning"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Leverantörens referens"
@@ -1947,11 +1813,6 @@ msgid "Invoice Lines"
msgstr "Fakturarader"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1968,7 +1829,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valda leverantören säljer endast denna produkt med %s"
@@ -1989,11 +1850,11 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2009,6 +1870,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Utlevererade produkter att fakturera"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2113,11 +1979,6 @@ msgid "January"
msgstr "januari"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2155,6 +2016,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totalt order per användare per månad"
@@ -2165,6 +2109,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lagerhus"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2173,7 +2123,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2269,11 +2219,6 @@ msgid "Pricelist Versions"
msgstr "Prislisteversioner"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Beställningar som har status Utkast"
@@ -2666,9 +2611,6 @@ msgstr "Ordrar"
#~ msgid "You can not confirm purchase order without Purchase Order Lines."
#~ msgstr "Du kan inte bekräfta beställningen utan inköpsorder"
-#~ msgid "Print"
-#~ msgstr "Skriv ut"
-
#~ msgid "Requests for Quotation"
#~ msgstr "Offertförfrågningar"
@@ -2727,6 +2669,9 @@ msgstr "Ordrar"
#~ msgid "Order in last month"
#~ msgstr "Ordrar under senaste månaden"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
#~ msgid "Create or Import Suppliers"
#~ msgstr "Skapa eller importera leverantörer"
@@ -2766,6 +2711,9 @@ msgstr "Ordrar"
#~ msgid "Order State"
#~ msgstr "Orderstatus"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Bolagsnamnet måste vara unikt !"
+
#~ msgid "You try to assign a lot which is not from the same product"
#~ msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
@@ -2787,6 +2735,9 @@ msgstr "Ordrar"
#~ msgid "Incoming Shipments Available"
#~ msgstr "Inkommande leveranser tillgängliga."
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referensen måste vara unik per bolag!"
+
#~ msgid "Addresses"
#~ msgstr "Adresser"
@@ -2812,6 +2763,9 @@ msgstr "Ordrar"
#~ msgid "Purchase order '%s' is cancelled."
#~ msgstr "Inköpsorder '%s' är avbruten."
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
+
#~ msgid "res_config_contents"
#~ msgstr "res_config_contents"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index bda647f8f4d..497edff5d48 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-01-19 11:33+0000\n"
"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
"Language-Team: Thai <th@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "ใช้ค่าเริ่มต้นรายการราคาซื้อ"
@@ -144,6 +61,11 @@ msgstr ""
"และจะคำนวณหาราคาซื้อของคู่ค้าปัจจุบันให้ตรงกับสินค้าและจำนวนที่เลือกไว้"
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "ราคาเฉลี่ย"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -311,14 +233,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -353,7 +275,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -419,17 +341,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -445,12 +362,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -471,7 +382,7 @@ msgid "Quantity"
msgstr "จำนวน"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -534,7 +445,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -565,13 +476,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -588,11 +492,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -616,11 +515,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -672,7 +566,7 @@ msgid "Supplier"
msgstr "ผู้จัดจำหน่าย"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -765,8 +659,8 @@ msgid "It indicates that a picking has been done"
msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -786,10 +680,9 @@ msgstr ""
"้อตลอดจนการประเมิณประสิทธิภาพการจัดส่งสินค้าของผู้จัดจำหน่าย"
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
+#: view:purchase.order:0
+msgid "Print"
+msgstr "พิมพ์"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -894,7 +787,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -905,11 +798,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "ช่องนี้บ่งบอกถึงใบแจ้งหนี้ได้รับการจ่ายเงินแล้ว"
@@ -1008,11 +896,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1062,7 +945,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1073,11 +956,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1101,11 +979,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1114,12 +992,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1131,7 +1014,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1150,7 +1033,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1161,7 +1044,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1210,11 +1093,6 @@ msgid "Set to Draft"
msgstr "กำหนดให้เป็นแบบร่าง"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "บันทึก"
@@ -1244,7 +1122,7 @@ msgid "Stock Move"
msgstr "รายการเคลื่อนไหวสินค้า"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1343,7 +1221,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1433,18 +1311,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1529,8 +1407,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1611,7 +1489,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1663,11 +1541,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1729,6 +1602,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1798,10 +1676,10 @@ msgid "Purchase Order"
msgstr "ใบสั่งซื้อ"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1846,7 +1724,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1862,13 +1740,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "ราคาสุทธิ"
@@ -1892,11 +1763,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "พบข้อผิดพลาด! คุณไม่สามารถสร้างบริษัทที่มีลักษณะวนซ้ำกันได้"
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "เลขที่อ้างอิงของผู้จัดจำหน่าย"
@@ -1934,11 +1800,6 @@ msgid "Invoice Lines"
msgstr "รายการจากใบแจ้งหนี้"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1952,7 +1813,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1973,11 +1834,11 @@ msgid "Configuration"
msgstr "การกำหนดค่า"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1993,6 +1854,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2097,11 +1963,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2139,6 +2000,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2149,6 +2093,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2157,7 +2107,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2241,11 +2191,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2330,9 +2275,6 @@ msgstr ""
#~ msgid "State"
#~ msgstr "สถานะ"
-#~ msgid "Print"
-#~ msgstr "พิมพ์"
-
#~ msgid "Address Contact Name"
#~ msgstr "ชื่อที่อยู่ที่ติดต่อ"
@@ -2455,6 +2397,9 @@ msgstr ""
#~ msgid "purchase.installer"
#~ msgstr "ตัวติดตั้งใบสั่งซื้อ"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "พบข้อผิดพลาด! คุณไม่สามารถสร้างบริษัทที่มีลักษณะวนซ้ำกันได้"
+
#, python-format
#~ msgid "No Partner!"
#~ msgstr "ไม่พบผู้จัดจำหน่าย!"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 422c768270c..724e7628feb 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2009-02-03 06:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -141,6 +58,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -181,16 +103,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -233,7 +155,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -308,14 +230,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -350,7 +272,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -416,17 +338,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -442,12 +359,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -468,7 +379,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -531,7 +442,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -562,13 +473,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -585,11 +489,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -613,11 +512,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -667,7 +561,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -760,8 +654,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -779,9 +673,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
msgstr ""
#. module: purchase
@@ -887,7 +780,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -898,11 +791,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1001,11 +889,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1055,7 +938,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1066,11 +949,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1094,11 +972,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1107,12 +985,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1124,7 +1007,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1143,7 +1026,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1154,7 +1037,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1203,11 +1086,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1237,7 +1115,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1336,7 +1214,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1426,18 +1304,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1522,8 +1400,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1604,7 +1482,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1656,11 +1534,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1722,6 +1595,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1789,10 +1667,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1834,7 +1712,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1850,13 +1728,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1880,11 +1751,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1919,11 +1785,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1937,7 +1798,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1958,11 +1819,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1978,6 +1839,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2082,11 +1948,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2124,6 +1985,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2134,6 +2078,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2142,7 +2092,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2226,11 +2176,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 92a71224ba0..b60ee4665f2 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-01-24 23:32+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "Varsayılan Alış Fiyat Listesi"
@@ -144,6 +61,11 @@ msgstr ""
"hesaplar."
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -184,16 +106,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Önce bu satınalma emriyle ilişkili bütün alımları iptal etmelisiniz."
@@ -236,7 +158,7 @@ msgid "Average Price"
msgstr "Ortalama Fiyat"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -313,15 +235,15 @@ msgstr ""
"olarak hesaplar."
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Faturalandırılacak onaylı satınalma siparişi"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -355,7 +277,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -424,17 +346,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Ekim"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -450,12 +367,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "Gelen ürünleri izlemek için bir alım listesi oluşturulur."
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "Referans her şirket için tekil olmalı!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -476,7 +387,7 @@ msgid "Quantity"
msgstr "Miktar"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -539,7 +450,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -570,13 +481,6 @@ msgid "Journal"
msgstr "Yevmiye"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -593,11 +497,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "İçinde faturalanmamış kalemler içeren satınalma emirleri"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Şirket adı tekil olmalı !"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -621,11 +520,6 @@ msgid "Purchase Lead Time"
msgstr "Satınalma Tedarik Süresii"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -680,7 +574,7 @@ msgid "Supplier"
msgstr "Tedarikçi"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -773,8 +667,8 @@ msgid "It indicates that a picking has been done"
msgstr "Bir alım gerçekleştirildiğini gösterir"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -795,10 +689,9 @@ msgstr ""
"sağlar."
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depo"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Yazdır"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -903,7 +796,7 @@ msgid "Stock Moves"
msgstr "Stok Hareketi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -914,11 +807,6 @@ msgid "Product Categories"
msgstr "Ürün Kategorileri"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "Bir faturanın ödendiğini gösterir"
@@ -1018,11 +906,6 @@ msgid "Qty"
msgstr "Mik."
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1072,7 +955,7 @@ msgid "Date Approved"
msgstr "Onaylanmış Tarih"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1083,11 +966,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Sipariş Tarihi"
@@ -1113,11 +991,11 @@ msgstr ""
"doldurup onaylayabilir. RFQ, onaylanan bir Satınalma Siparişi haline gelir."
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1126,12 +1004,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1143,7 +1026,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1162,7 +1045,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1173,7 +1056,7 @@ msgid "Purchase Dashboard"
msgstr "Satınalma Paneli"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1222,11 +1105,6 @@ msgid "Set to Draft"
msgstr "Taslak olarak Ayarla"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notlar"
@@ -1256,7 +1134,7 @@ msgid "Stock Move"
msgstr "Stok Hareketi"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1358,7 +1236,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1448,18 +1326,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Satınalma Siparişi Öğesi Faturalandırma"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "SA: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Faturalandırılacak giden ürünler"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1544,9 +1422,9 @@ msgid "Invoice"
msgstr "Fatura"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Faturalandırılacak onaylı satınalma siparişi"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1626,7 +1504,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1678,11 +1556,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Faturalama Kontrolü"
@@ -1744,6 +1617,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1813,10 +1691,10 @@ msgid "Purchase Order"
msgstr "Satınalma Siparişi"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1860,7 +1738,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1876,13 +1754,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Net Fiyat"
@@ -1906,11 +1777,6 @@ msgid "Based on receptions"
msgstr "sevkiyatlar Temelinde"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "Tedarikçi Referansı"
@@ -1948,11 +1814,6 @@ msgid "Invoice Lines"
msgstr "Fatura Kalemleri"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1969,7 +1830,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar"
@@ -1990,11 +1851,11 @@ msgid "Configuration"
msgstr "Yapılandırma"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -2010,6 +1871,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Faturalandırılacak giden ürünler"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2114,11 +1980,6 @@ msgid "January"
msgstr "Ocak"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2156,6 +2017,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Aylık Toplam Kullanıcı Siparişi"
@@ -2166,6 +2110,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2174,7 +2124,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2272,11 +2222,6 @@ msgid "Pricelist Versions"
msgstr "Fiyat Listesi Sürümleri"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Taslak durumundaki satınalma siparişleri"
@@ -2563,12 +2508,12 @@ msgstr "Siparişler"
#~ msgid "Wrong Product UOM !"
#~ msgstr "Hatalı Birim!"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
+
#~ msgid "State"
#~ msgstr "Durum"
-#~ msgid "Print"
-#~ msgstr "Yazdır"
-
#, python-format
#~ msgid "No Partner!"
#~ msgstr "Ortak yok!"
@@ -2904,6 +2849,9 @@ msgstr "Siparişler"
#~ msgid "Order in current month"
#~ msgstr "Bu ayki Emirler"
+#~ msgid "The company name must be unique !"
+#~ msgstr "Şirket adı tekil olmalı !"
+
#~ msgid "Is a Back Order"
#~ msgstr "Birikmiş Sipariş mi (backorder)"
@@ -2911,6 +2859,9 @@ msgstr "Siparişler"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Bu satınalma emri iptal edilemiyor!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referans her şirket için tekil olmalı!"
+
#~ msgid "Not invoiced"
#~ msgstr "Faturalanmamış"
@@ -2942,6 +2893,9 @@ msgstr "Siparişler"
#~ msgid "Back Orders"
#~ msgstr "Sipariş Bakiyeleri"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
+
#~ msgid "purchase.config.wizard"
#~ msgstr "satınalma.yapılandır.sihirbaz"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 437ddadc762..65e3eda3ecb 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 18:15+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -141,6 +58,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -181,16 +103,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -233,7 +155,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -308,14 +230,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -350,7 +272,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -416,17 +338,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -442,12 +359,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -468,7 +379,7 @@ msgid "Quantity"
msgstr "Кількість"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -531,7 +442,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -562,13 +473,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -585,11 +489,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -613,11 +512,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -667,7 +561,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -760,8 +654,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -779,10 +673,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -887,7 +780,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -898,11 +791,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1001,11 +889,6 @@ msgid "Qty"
msgstr "К-сть"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1055,7 +938,7 @@ msgid "Date Approved"
msgstr "Затверджена дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1066,11 +949,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1094,11 +972,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1107,12 +985,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1124,7 +1007,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1143,7 +1026,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1154,7 +1037,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1203,11 +1086,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Примітки"
@@ -1237,7 +1115,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1336,7 +1214,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1426,18 +1304,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1522,8 +1400,8 @@ msgid "Invoice"
msgstr "Інвойс"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1604,7 +1482,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1656,11 +1534,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "Контроль інвойсування"
@@ -1722,6 +1595,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1791,10 +1669,10 @@ msgid "Purchase Order"
msgstr "Заявка на придбання"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1836,7 +1714,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1852,13 +1730,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "Внутрішня ціна"
@@ -1882,11 +1753,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1921,11 +1787,6 @@ msgid "Invoice Lines"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1939,7 +1800,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1960,11 +1821,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1980,6 +1841,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2084,11 +1950,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2126,6 +1987,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2136,6 +2080,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2144,7 +2094,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2228,11 +2178,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 077bf6eff78..e0eb246f425 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2011-07-31 06:20+0000\n"
"Last-Translator: OpenBMS JSC <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -42,89 +42,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -142,6 +59,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -182,16 +104,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -234,7 +156,7 @@ msgid "Average Price"
msgstr "Giá trung bình"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -309,14 +231,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -351,7 +273,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -417,17 +339,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "Tháng Mười"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -443,12 +360,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -469,7 +380,7 @@ msgid "Quantity"
msgstr "Số lượng"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -532,7 +443,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -563,13 +474,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -586,11 +490,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -614,11 +513,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -668,7 +562,7 @@ msgid "Supplier"
msgstr "Nhà cung cấp"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -761,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -780,10 +674,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Kho hàng"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "In"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -888,7 +781,7 @@ msgid "Stock Moves"
msgstr "Dịch chuyển hàng tồn kho"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -899,11 +792,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1002,11 +890,6 @@ msgid "Qty"
msgstr "Số lượng"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1056,7 +939,7 @@ msgid "Date Approved"
msgstr "Ngày được chấp thuận"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1067,11 +950,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1095,11 +973,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1108,12 +986,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1125,7 +1008,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1144,7 +1027,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1155,7 +1038,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1204,11 +1087,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Ghi chú"
@@ -1238,7 +1116,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1337,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1427,18 +1305,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1523,8 +1401,8 @@ msgid "Invoice"
msgstr "Hóa đơn"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1605,7 +1483,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1657,11 +1535,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1723,6 +1596,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1790,10 +1668,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1835,7 +1713,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1851,13 +1729,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1881,11 +1752,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1920,11 +1786,6 @@ msgid "Invoice Lines"
msgstr "Dòng hoá đơn"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1938,7 +1799,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1959,11 +1820,11 @@ msgid "Configuration"
msgstr "Cấu hình"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1979,6 +1840,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2083,11 +1949,6 @@ msgid "January"
msgstr "Tháng Một"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2125,6 +1986,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2135,6 +2079,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Kho hàng"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2143,7 +2093,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2227,11 +2177,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2287,9 +2232,6 @@ msgstr ""
#~ msgid "State"
#~ msgstr "Trạng thái"
-#~ msgid "Print"
-#~ msgstr "In"
-
#, python-format
#~ msgid "Error !"
#~ msgstr "Lỗi !"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index c9fef0cad75..f3e350c96ab 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-28 11:54+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -43,166 +43,6 @@ msgstr ""
"例如:产品:该产品被弃用,不要采购多于 5个。"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>您好 ${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
-" \n"
-" <p>这是一个 ${object.state in ('draft', 'sent') and '询价单' or '采购单确认函'} 来自 "
-"${object.company_id.name}: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>编号</strong><br />\n"
-" &nbsp;&nbsp;&nbsp;订单号: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;订单总计: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;订单日期: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>如果有任何问题,请与我们联系.</p>\n"
-" <p>谢谢!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr "默认采购价格表"
@@ -220,6 +60,11 @@ msgid ""
msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -260,16 +105,16 @@ msgid ""
msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图,这一摘要直接是是HTML格式。"
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr "警告!"
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "你必须首先这个采购订单相关的所有收货单。"
@@ -317,7 +162,7 @@ msgid "Average Price"
msgstr "均价"
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr "发票 <b>已经支付</b>."
@@ -392,15 +237,15 @@ msgid ""
msgstr "计算所有采购订单明细产品的最小计划日期"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "要删除采购订单,你必须先取消它"
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "已确认采购订单要开发票"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr "当你卖出这个产品时,Openerp 将触发"
#. module: purchase
#: view:purchase.order:0
@@ -434,7 +279,7 @@ msgid "Quotation "
msgstr "报价单 "
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -509,17 +354,12 @@ msgstr ""
" "
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr "你必须为这个产品指定序列号"
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr "10月"
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr "采购订单r <em>%s</em> <b>被取消</b>."
@@ -535,12 +375,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr "生成装箱单用来跟踪入库的产品"
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr "编号必须在公司内唯一!"
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -561,7 +395,7 @@ msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr "发运 <em>%s</em> <b>已排程</b> 为%s."
@@ -631,7 +465,7 @@ msgid ""
msgstr "如果你要直接从供应商发货给给客户,输入一个地址。否则,发给你自己公司的时候,留空。"
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr "发票草稿 %s %s is <b>等待核准</b>."
@@ -664,13 +498,6 @@ msgid "Journal"
msgstr "凭证簿"
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr "错误:默认的计量单位和采购计量单位必须是相同的类别"
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -687,11 +514,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr "包含未开票明细的采购单"
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "公司名必须唯一!"
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -715,11 +537,6 @@ msgid "Purchase Lead Time"
msgstr "采购提前期"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr "错误:无效的(EAN)条码"
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -769,7 +586,7 @@ msgid "Supplier"
msgstr "供应商"
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "定义这个公司的费用科目: \"%s\" (id:%d)."
@@ -870,8 +687,8 @@ msgid "It indicates that a picking has been done"
msgstr "这表示装箱单已完成"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "不能取消这个采购订单"
@@ -889,10 +706,9 @@ msgid ""
msgstr "接收分析使您轻松检查和分析您公司订单的接收数量和您供应商交货的特性。"
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
+#: view:purchase.order:0
+msgid "Print"
+msgstr "打印"
#. module: purchase
#: field:purchase.order,order_line:0
@@ -997,7 +813,7 @@ msgid "Stock Moves"
msgstr "库存调拨"
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr "采购单草稿被创建"
@@ -1008,11 +824,6 @@ msgid "Product Categories"
msgstr "产品分类"
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr "发送询价单"
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr "这表明发票已支付"
@@ -1111,11 +922,6 @@ msgid "Qty"
msgstr "数量"
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr "在采购订单的地址"
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1165,7 +971,7 @@ msgid "Date Approved"
msgstr "审批日期"
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr "询价单<b>被创建</b>."
@@ -1176,11 +982,6 @@ msgid "a draft purchase order"
msgstr "一个采购订单草稿"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr "您企图为不一样的产品创建批号"
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "本年的订单"
@@ -1204,14 +1005,12 @@ msgid ""
msgstr "在这业务产品没有供应商,买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
-msgstr ""
-"对超过最小数量的采购,提供一个双重核准机制。\n"
-"要安装模块 purchase_double_validation"
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr "允许给不同类别的供应商按规则管理不同的基础价格。例如:零售10%折扣,这个产品优惠5欧元,等等。"
#. module: purchase
#: model:ir.model,name:purchase.model_mail_mail
@@ -1219,12 +1018,17 @@ msgid "Outgoing Mails"
msgstr "发出邮件"
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "你不能确认没有任何明细的采购订单"
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "消息和通信历史"
@@ -1236,7 +1040,7 @@ msgid "Destination Warehouse"
msgstr "目标仓库"
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1255,7 +1059,7 @@ msgid "Manage pricelist per supplier"
msgstr "管理每个供应商的价格表"
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr "采购订单被设置为“草稿”"
@@ -1266,7 +1070,7 @@ msgid "Purchase Dashboard"
msgstr "采购控制台"
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "首先取消这个采购订单相关的入库单"
@@ -1315,11 +1119,6 @@ msgid "Set to Draft"
msgstr "设为草稿"
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr "允许收入产品和开票为不同的地址"
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "备注"
@@ -1349,7 +1148,7 @@ msgid "Stock Move"
msgstr "库存调拨"
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr "非法的动作"
@@ -1448,7 +1247,7 @@ msgid ""
msgstr "一个草稿"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr "请创建发票"
@@ -1545,18 +1344,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr "采购订单明细生成发票"
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "出仓产品要开发票"
+#: view:purchase.order:0
+msgid "Send by EMail"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "为公司 \"%s\" (id:%d) 定义采购账簿。"
@@ -1641,9 +1440,9 @@ msgid "Invoice"
msgstr "发票"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
-msgstr "当你卖出这个产品时,Openerp 将触发"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "已确认采购订单要开发票"
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
@@ -1732,7 +1531,7 @@ msgid "Compute product cost price based on average cost"
msgstr "基于平均成本计算产品成本"
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1788,11 +1587,6 @@ msgid "Invoice Received"
msgstr "收到的发票"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr "标记为未读"
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr "开票方式"
@@ -1856,6 +1650,11 @@ msgid "Open Purchase Menu"
msgstr "打开采购菜单"
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1923,10 +1722,10 @@ msgid "Purchase Order"
msgstr "采购订单"
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1974,7 +1773,7 @@ msgid "# of Purchase Order"
msgstr "采购订单号"
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr "装运货物 <b>已经收到</b>."
@@ -1990,13 +1789,6 @@ msgid "Resend Purchase Order"
msgstr "重发采购订单"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr "允许在采购订单给运输和发票指定不同的地址。"
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr "净价"
@@ -2020,11 +1812,6 @@ msgid "Based on receptions"
msgstr "基于收货单"
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "错误!您不能创建递归公司."
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr "供应商单号"
@@ -2061,11 +1848,6 @@ msgid "Invoice Lines"
msgstr "发票明细"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr "标记为已读"
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -2079,7 +1861,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "选择的供应商只销售这产品 %s"
@@ -2100,12 +1882,14 @@ msgid "Configuration"
msgstr "设置"
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
-msgstr "允许给不同类别的供应商按规则管理不同的基础价格。例如:零售10%折扣,这个产品优惠5欧元,等等。"
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
+msgstr ""
+"对超过最小数量的采购,提供一个双重核准机制。\n"
+"要安装模块 purchase_double_validation"
#. module: purchase
#: code:addons/purchase/edi/purchase_order.py:132
@@ -2120,6 +1904,11 @@ msgid "Reference Unit of Measure"
msgstr "参考计量单位"
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "出仓产品要开发票"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2224,11 +2013,6 @@ msgid "January"
msgstr "1月"
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr "你不能从视图类型的库位移动"
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2269,6 +2053,89 @@ msgid "Invoicing Settings"
msgstr "开票设置"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "按用户每月的订单总金额"
@@ -2279,6 +2146,12 @@ msgid "Based on incoming shipments"
msgstr "基于收货量"
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2287,7 +2160,7 @@ msgid ""
msgstr "销售单或者供应商发送的报价单的参考编号。主要 用于根据这个参考号(通常写在供应商送来的发运单上面) 查找对应的产品。"
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2380,11 +2253,6 @@ msgid "Pricelist Versions"
msgstr "价格表版本"
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr "错误,您不能创建循环引用的会员用户"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "出于草稿状态的采购单"
@@ -2694,6 +2562,9 @@ msgstr "订单"
#~ msgid "Cannot delete Purchase Order(s) which are in %s State!"
#~ msgstr "无法删除 %s 状态的采购订单"
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "错误!您不能创建递归公司."
+
#, python-format
#~ msgid "Warning"
#~ msgstr "警告"
@@ -2704,9 +2575,6 @@ msgstr "订单"
#~ msgid "State"
#~ msgstr "状态"
-#~ msgid "Print"
-#~ msgstr "打印"
-
#~ msgid "General Information"
#~ msgstr "一般信息"
@@ -3105,6 +2973,9 @@ msgstr "订单"
#~ msgid "Based on Purchase Order Lines"
#~ msgstr "基于采购单明细"
+#~ msgid "The company name must be unique !"
+#~ msgstr "公司名必须唯一!"
+
#~ msgid "UoM Categories"
#~ msgstr "计量单位分类"
@@ -3112,6 +2983,9 @@ msgstr "订单"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "不能取消此采购单!"
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "编号必须在公司内唯一!"
+
#~ msgid "Not invoiced"
#~ msgstr "未开票"
@@ -3127,6 +3001,9 @@ msgstr "订单"
#~ msgid "Order in current year"
#~ msgstr "当前年度采购单"
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "错误,您不能创建循环引用的会员用户"
+
#~ msgid "Purchase orders which are not approved yet."
#~ msgstr "尚未核准的采购单"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 48edd3a7ceb..056264acaf0 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2009-01-30 13:18+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -41,89 +41,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
msgstr ""
@@ -141,6 +58,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
+msgid "Purchase: Mark read"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -181,16 +103,16 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
-#: code:addons/purchase/purchase.py:971
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:991
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:556
+#: code:addons/purchase/purchase.py:573
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -233,7 +155,7 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:813
+#: code:addons/purchase/purchase.py:830
#, python-format
msgid "Invoice <b>paid</b>."
msgstr ""
@@ -308,14 +230,14 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
msgstr ""
#. module: purchase
@@ -350,7 +272,7 @@ msgid "Quotation "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:793
+#: code:addons/purchase/purchase.py:810
#, python-format
msgid ""
"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
@@ -416,17 +338,12 @@ msgid ""
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
msgstr ""
@@ -442,12 +359,6 @@ msgid "A pick list is generated to track the incoming products."
msgstr ""
#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
#: view:purchase.order:0
@@ -468,7 +379,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
msgstr ""
@@ -531,7 +442,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
msgstr ""
@@ -562,13 +473,6 @@ msgid "Journal"
msgstr ""
#. module: purchase
-#: constraint:product.template:0
-msgid ""
-"Error: The default Unit of Measure and the purchase Unit of Measure must be "
-"in the same category."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
@@ -585,11 +489,6 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
@@ -613,11 +512,6 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid ""
"The invoice is created automatically if the Invoice control of the purchase "
@@ -667,7 +561,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -760,8 +654,8 @@ msgid "It indicates that a picking has been done"
msgstr "代表已完成提貨"
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -779,10 +673,9 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
#. module: purchase
#: field:purchase.order,order_line:0
@@ -887,7 +780,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -898,11 +791,6 @@ msgid "Product Categories"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
msgstr ""
@@ -1001,11 +889,6 @@ msgid "Qty"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
-#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
#: view:purchase.config.settings:0
@@ -1055,7 +938,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation <b>created</b>."
msgstr ""
@@ -1066,11 +949,6 @@ msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -1094,11 +972,11 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
+#: help:purchase.config.settings,group_purchase_pricelist:0
msgid ""
-"Provide a double validation mechanism for purchases exceeding minimum "
-"amount.\n"
-" This installs the module purchase_double_validation."
+"Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
msgstr ""
#. module: purchase
@@ -1107,12 +985,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
+#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1124,7 +1007,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1143,7 +1026,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to <b>draft</b>."
msgstr ""
@@ -1154,7 +1037,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1203,11 +1086,6 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "注解"
@@ -1237,7 +1115,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1336,7 +1214,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1426,18 +1304,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1522,8 +1400,8 @@ msgid "Invoice"
msgstr "發票"
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1604,7 +1482,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1656,11 +1534,6 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
@@ -1722,6 +1595,11 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
#: view:purchase.report:0
@@ -1789,10 +1667,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1834,7 +1712,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment <b>received</b>."
msgstr ""
@@ -1850,13 +1728,6 @@ msgid "Resend Purchase Order"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a purchase "
-"order."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
msgstr ""
@@ -1880,11 +1751,6 @@ msgid "Based on receptions"
msgstr ""
#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
msgstr ""
@@ -1919,11 +1785,6 @@ msgid "Invoice Lines"
msgstr "發票明細"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid ""
"Purchase Analysis allows you to easily check and analyse your company "
@@ -1937,7 +1798,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1958,11 +1819,11 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
+#: help:purchase.config.settings,module_purchase_double_validation:0
msgid ""
-"Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this "
-"product, etc."
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1978,6 +1839,11 @@ msgid "Reference Unit of Measure"
msgstr ""
#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2082,11 +1948,6 @@ msgid "January"
msgstr ""
#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,invoice_method:0
msgid ""
"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
@@ -2124,6 +1985,89 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2134,6 +2078,12 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: purchase
#: help:purchase.order,partner_ref:0
msgid ""
"Reference of the sale order or quotation sent by your supplier. It's mainly "
@@ -2142,7 +2092,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:974
+#: code:addons/purchase/purchase.py:991
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2226,11 +2176,6 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""