summaryrefslogtreecommitdiff
path: root/addons/purchase
diff options
context:
space:
mode:
authorLaunchpad Translations on behalf of openerp <>2011-09-06 04:40:18 +0000
committerLaunchpad Translations on behalf of openerp <>2011-09-06 04:40:18 +0000
commit752df5acbdc1507ba7ff942fc5851fd86383e445 (patch)
tree00d7993e47bc7fdec93065aa53c001dfd31c2896 /addons/purchase
parent1dbb376d09707fc4909eb93f88c95c2b520849cf (diff)
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
Diffstat (limited to 'addons/purchase')
-rw-r--r--addons/purchase/i18n/ar.po57
-rw-r--r--addons/purchase/i18n/bg.po57
-rw-r--r--addons/purchase/i18n/bs.po57
-rw-r--r--addons/purchase/i18n/ca.po4
-rw-r--r--addons/purchase/i18n/cs.po62
-rw-r--r--addons/purchase/i18n/de.po205
-rw-r--r--addons/purchase/i18n/el.po83
-rw-r--r--addons/purchase/i18n/en_GB.po57
-rw-r--r--addons/purchase/i18n/es.po166
-rw-r--r--addons/purchase/i18n/es_AR.po72
-rw-r--r--addons/purchase/i18n/es_CL.po166
-rw-r--r--addons/purchase/i18n/es_EC.po69
-rw-r--r--addons/purchase/i18n/et.po84
-rw-r--r--addons/purchase/i18n/fi.po123
-rw-r--r--addons/purchase/i18n/fr.po83
-rw-r--r--addons/purchase/i18n/gl.po57
-rw-r--r--addons/purchase/i18n/hr.po78
-rw-r--r--addons/purchase/i18n/hu.po69
-rw-r--r--addons/purchase/i18n/id.po57
-rw-r--r--addons/purchase/i18n/it.po132
-rw-r--r--addons/purchase/i18n/ko.po71
-rw-r--r--addons/purchase/i18n/lt.po60
-rw-r--r--addons/purchase/i18n/mn.po109
-rw-r--r--addons/purchase/i18n/nb.po57
-rw-r--r--addons/purchase/i18n/nl.po72
-rw-r--r--addons/purchase/i18n/nl_BE.po57
-rw-r--r--addons/purchase/i18n/pl.po163
-rw-r--r--addons/purchase/i18n/pt.po102
-rw-r--r--addons/purchase/i18n/pt_BR.po192
-rw-r--r--addons/purchase/i18n/ro.po59
-rw-r--r--addons/purchase/i18n/ru.po123
-rw-r--r--addons/purchase/i18n/sk.po57
-rw-r--r--addons/purchase/i18n/sl.po72
-rw-r--r--addons/purchase/i18n/sq.po57
-rw-r--r--addons/purchase/i18n/sr.po69
-rw-r--r--addons/purchase/i18n/sr@latin.po69
-rw-r--r--addons/purchase/i18n/sv.po57
-rw-r--r--addons/purchase/i18n/th.po57
-rw-r--r--addons/purchase/i18n/tlh.po57
-rw-r--r--addons/purchase/i18n/tr.po57
-rw-r--r--addons/purchase/i18n/uk.po67
-rw-r--r--addons/purchase/i18n/vi.po75
-rw-r--r--addons/purchase/i18n/zh_CN.po227
-rw-r--r--addons/purchase/i18n/zh_TW.po57
44 files changed, 1354 insertions, 2427 deletions
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 5c77e6a30fb..8561ee6bf6b 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -759,7 +759,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1674,7 +1673,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index ce72e938659..cac8adf584d 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"става потвърена Поръчка."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Назначение"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -121,7 +121,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -144,7 +144,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Няма ценова листа !"
@@ -237,7 +237,7 @@ msgid "Partial Picking"
msgstr "Частично товарене"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Поръчката '%s' е потвърдена."
@@ -284,7 +284,7 @@ msgid "Notes"
msgstr "Бележки"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -361,7 +361,7 @@ msgid "Cancelled"
msgstr "Отказани"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Поръчката е над лимита"
@@ -415,7 +415,7 @@ msgid "Reference"
msgstr "Препратка"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Не могат да се трият Поръчка/и в състояние %s!"
@@ -437,7 +437,7 @@ msgid "Day"
msgstr "Ден"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -454,8 +454,8 @@ msgid "# of Lines"
msgstr "# от редове"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Грешни мерни единици"
@@ -592,7 +592,7 @@ msgid "Order Lines"
msgstr "Редове от поръчка"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Няма партньор"
@@ -641,9 +641,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Фактури генерирани за поръчка"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -701,7 +701,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Невалидно действие !"
@@ -779,7 +779,7 @@ msgid " Month-1 "
msgstr " Месец-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -790,7 +790,7 @@ msgid "Manual"
msgstr "Ръчно"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -904,7 +904,6 @@ msgid "Month"
msgstr "Месец"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Чака потвърждение от доставчик"
@@ -1107,7 +1106,7 @@ msgid "Manual Invoices"
msgstr "Ръчно издадени фактури"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1124,14 +1123,14 @@ msgid "Extended Filters..."
msgstr "Разширени филтри"
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr "Трябва първо да откажете всички фактури прикрепени към тази поръчка"
@@ -1178,7 +1177,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1440,7 +1439,7 @@ msgid "Date Approved"
msgstr "Одобрен на дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1552,7 +1551,7 @@ msgid "Total Qty and Amount by month"
msgstr "Общо количество и сума на месец"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1696,7 +1695,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Поръчка '%s' е отказана."
@@ -1773,7 +1772,7 @@ msgid "Partner"
msgstr "Партньор"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index d447b0abc7c..674fcd43ed0 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr "Odredište"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -226,7 +226,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -273,7 +273,7 @@ msgid "Notes"
msgstr "Napomene"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -347,7 +347,7 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -401,7 +401,7 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -423,7 +423,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -440,8 +440,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -478,7 +478,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -578,7 +578,7 @@ msgid "Order Lines"
msgstr "Redovi naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -627,9 +627,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -687,7 +687,7 @@ msgid "Reservation Destination"
msgstr "Odredište rezervacije"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -765,7 +765,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -776,7 +776,7 @@ msgid "Manual"
msgstr "Ručno"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -892,7 +892,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1095,7 +1094,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1112,14 +1111,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1166,7 +1165,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1433,7 +1432,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1545,7 +1544,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1689,7 +1688,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1766,7 +1765,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index e37438439db..2a5c736de7b 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index ad48bccef92..a111766f937 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-07-15 02:37+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
"X-Poedit-Language: Czech\n"
#. module: purchase
@@ -27,7 +27,7 @@ msgstr ""
"potvrzenou nákupní objednávkou."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Nemůžete potvrdit nákupní objednávku bez řádků Nákupní objednávky."
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "Cíl"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -118,7 +118,7 @@ msgstr ""
"sledovat obdržené výrobky a ovládat faktury dodavatelů."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -141,7 +141,7 @@ msgid "From a Pick list"
msgstr "Ze seznamu navádění"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Žádný ceník !"
@@ -232,7 +232,7 @@ msgid "Partial Picking"
msgstr "Částečné navádění"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Nákupní objednávka '%s' je potvrzena."
@@ -279,7 +279,7 @@ msgid "Notes"
msgstr "Poznámky"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -355,7 +355,7 @@ msgid "Cancelled"
msgstr "Zrušeno"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Částka nákupu je nad limitem"
@@ -409,7 +409,7 @@ msgid "Reference"
msgstr "Odkaz"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Nelze smazat Nákupní objednávku(y), která je ve stavu %s!"
@@ -431,7 +431,7 @@ msgid "Day"
msgstr "Den"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Nákupní objednávka '%s' byla nasatavena do návrhového stavu."
@@ -448,8 +448,8 @@ msgid "# of Lines"
msgstr "# z řádek"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -486,7 +486,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Nesprávná MJ výrobku !"
@@ -588,7 +588,7 @@ msgid "Order Lines"
msgstr "Řádky objednávky"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Žádný partner!"
@@ -637,9 +637,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Faktury generované pro nákupní objednávku"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -700,7 +700,7 @@ msgid "Reservation Destination"
msgstr "Cíl rezervace"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Neplatná akce !"
@@ -780,7 +780,7 @@ msgid " Month-1 "
msgstr " Měsíc-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "Pro tuto společnost není určen nákupní deník: \"%s\" (id:%d)"
@@ -791,7 +791,7 @@ msgid "Manual"
msgstr "Ruční"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -908,7 +908,6 @@ msgid "Month"
msgstr "Měsíc"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Čekání na potvrzení dodavatelem"
@@ -1112,7 +1111,7 @@ msgid "Manual Invoices"
msgstr "Ruční faktury"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1129,14 +1128,14 @@ msgid "Extended Filters..."
msgstr "Rozšířené filtry..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Pro tento výrobek nebyl definován nákladový účet: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1184,7 +1183,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1447,7 +1446,7 @@ msgid "Date Approved"
msgstr "Datum schválení"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Nelze zrušit tuto nákupní objednávku !"
@@ -1559,7 +1558,7 @@ msgid "Total Qty and Amount by month"
msgstr "Celkové množ. a částka za měsíc"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Nelze zrušit nákupní objednávku !"
@@ -1705,7 +1704,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Nákupní objednávka '%s' zrušena."
@@ -1785,7 +1784,7 @@ msgid "Partner"
msgstr "Partner"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1840,3 +1839,6 @@ msgstr "Nástěnka nákupu"
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Nefakturované nákupní řádky"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 23136992873..103791c9f0c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -28,7 +28,7 @@ msgstr ""
"Beschaffungsauftrag (Bestellung)."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -47,7 +47,7 @@ msgid "Destination"
msgstr "Zielort"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -132,7 +132,7 @@ msgstr ""
"Eingangsrechnung vornehmen."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -156,7 +156,7 @@ msgid "From a Pick list"
msgstr "vom Lieferauftrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Keine Preisliste!"
@@ -250,7 +250,7 @@ msgid "Partial Picking"
msgstr "Lieferung Teilmenge"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Beschaffungsauftrag '%s' wurde bestätigt."
@@ -297,7 +297,7 @@ msgid "Notes"
msgstr "Bemerkungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -378,7 +378,7 @@ msgid "Cancelled"
msgstr "Abgebrochen"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Beschaffungswert übersteigt Limit"
@@ -432,7 +432,7 @@ msgid "Reference"
msgstr "Referenz"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Einkaufsaufträge mit dem Status %s können nicht gelöscht werden"
@@ -454,7 +454,7 @@ msgid "Day"
msgstr "Tag"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Beschaffungsauftrag '%s' wurde in Entwurf Status versetzt"
@@ -471,8 +471,8 @@ msgid "# of Lines"
msgstr "# Positionen"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -509,7 +509,7 @@ msgid "It indicates that a picking has been done"
msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Falsche Mengeneinheit!"
@@ -615,7 +615,7 @@ msgid "Order Lines"
msgstr "Auftragszeilen"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Kein Partner!"
@@ -672,9 +672,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Erstellte Eingangsrechnung für Beschaffungsauftrag"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -739,7 +739,7 @@ msgid "Reservation Destination"
msgstr "Reservierung Auslieferungsziel"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Fehlerhafte Aktion"
@@ -824,7 +824,7 @@ msgid " Month-1 "
msgstr " Monat-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -837,7 +837,7 @@ msgid "Manual"
msgstr "Manuelle Rechnung"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -961,7 +961,6 @@ msgid "Month"
msgstr "Monat"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Erwarte Auftragsbestätigung"
@@ -1169,7 +1168,7 @@ msgid "Manual Invoices"
msgstr "Erzeuge Rechnungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1188,7 +1187,7 @@ msgid "Extended Filters..."
msgstr "Erweiterter Filter..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1196,7 +1195,7 @@ msgstr ""
"Es ist kein Aufwandskonto für dieses Produkt hinterlegt: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1256,7 +1255,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1529,7 +1528,7 @@ msgid "Date Approved"
msgstr "Datum Annahme"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Konnte den Beschaffungsauftrag nicht abbrechen!"
@@ -1647,7 +1646,7 @@ msgid "Total Qty and Amount by month"
msgstr "Gesamtmenge und Umsatz nach Monaten"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Konnte Beschaffungsvorgang nicht abbrechen!"
@@ -1815,7 +1814,7 @@ msgstr ""
"einen Beschaffungsauftrag abbricht."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Beschaffungsauftrag '%s' wurde abgebrochen"
@@ -1897,7 +1896,7 @@ msgid "Partner"
msgstr "Partner"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1947,23 +1946,9 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Pinnwand Einkauf"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Sie können keine sich zeitlich überlappende Versionen von Preislisten haben."
-
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Vorab Eingangsrechnung zur Wareneingangskontrolle"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Bitte berücksichtige folgendes: Aufträge werden nur zusammengefasst wenn Sie "
-#~ "an denselben Partner gerichtet sind und der Wareneingang denselben Lagerort "
-#~ "betrifft. Außerdem werden Einzelpositionen nur zusammengefasst wenn sie "
-#~ "exakt gleich sind (bis auf Menge und Einheit)."
-
#~ msgid "Packing"
#~ msgstr "Packliste"
@@ -1979,9 +1964,6 @@ msgstr "Pinnwand Einkauf"
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Beschaffungsaufträge (in Bearbeitung)"
-#~ msgid "N°"
-#~ msgstr "Nr."
-
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Bestätigter Beschaffungsauftrag"
@@ -2158,149 +2140,18 @@ msgstr "Pinnwand Einkauf"
#~ msgid "Date"
#~ msgstr "Datum"
-#~ msgid "Manual in progress"
-#~ msgstr "Auftrag in manueller Bearbeitung"
-
-#~ msgid "In progress"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Warteliste"
-
-#~ msgid "Quotation"
-#~ msgstr "Angebot"
-
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-#~ msgid "To be Invoiced"
-#~ msgstr "Abzurechnen"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Eine Eingangsrechnung für einen Beschaffungsauftrag"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "Über das Menü Beschaffungsaufträge, können Sie den Status Ihrer Bestellungen "
-#~ "rückverfolgen: Haben Sie die Produkte erhalten, wurde eine Rechnung "
-#~ "erstellt, ist die Rechnung gebucht und ist die Rechnung bereits bezahlt oder "
-#~ "nach wie vor offen.\n"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Nutzen Sie dieses Menü für die Erfassung und Rückverfolgung von "
-#~ "Eingangsrechnungen. OpenERP erzeugt vorab Rechnungen im Status Entwurf "
-#~ "entweder bereits auf Basis der Bestellung oder später durch den "
-#~ "Wareneingang. Sobald Sie dann die tatsächliche Rechnung ihres Lieferanten "
-#~ "erhalten, können Sie diese Rechnung mit dem Entwurf abgleichen und die "
-#~ "Eingangsrechnung buchen."
-
#~ msgid ""
#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
#~ "Item!"
#~ msgstr ""
#~ "Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ " Please note that: \n"
-#~ " \n"
-#~ " Orders will only be merged if: \n"
-#~ " * Purchase Orders are in draft \n"
-#~ " * Purchase Orders belong to the same supplier \n"
-#~ " * Purchase Orders are have same stock location, same pricelist \n"
-#~ " \n"
-#~ " Lines will only be merged if: \n"
-#~ " * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ " "
-#~ msgstr ""
-#~ " Bitte beachten Sie folgendes: \n"
-#~ "\n"
-#~ " Aufträge werden nur zusammengefasst, wenn folgendes zutreffend ist:\n"
-#~ " * Beschaffungsauftrag im Entwurf\n"
-#~ " * Beschaffungsaufträge beim selben Lieferanten\n"
-#~ " * Beschaffungsaufträge beinhalten identische Lagerorte, sowie eine "
-#~ "identische Preisliste.\n"
-#~ "\n"
-#~ "Auftragspositionen werden nur zusammengefasst, wenn folgendes zutreffend "
-#~ "ist:\n"
-#~ " * Die Auftragsposition ist exakt identisch, bis auf: Produkt, Menge und "
-#~ "Einheit \n"
-#~ " "
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Durch das Menü Angebotsanfragen können Sie neue Angebote bei Lieferanten "
-#~ "anfragen, bestehende Anfragen rückverfolgen, eine Bestellung tätigen sowie "
-#~ "die Auftragsbestätigung durch den Lieferanten eingeben. Durch Ihre "
-#~ "Bestellung wird dann ein Beschaffungsauftrag erzeugt, der wiederum folgende "
-#~ "weitere Wokflows auslöst: Erstellung eines Wareneingangslieferscheins im "
-#~ "Status Entwurf, Eingangsrechnung im Entwurf zur Rechnungskontrolle."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Verwenden Sie die Daten zu Ihren Lieferanten und nutzen Sie das Supplier "
-#~ "Relationship Management. Sie können über den Aktenreiter Historie bei Ihren "
-#~ "Lieferanten folgende Informationen einsehen: Gesendete EMails, Bestellungen, "
-#~ "Gemeinsame Termine, etc."
-
-#~ msgid "Product UoM"
-#~ msgstr "Produkt ME"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
#~ msgid "From Picking"
#~ msgstr "Rechnung durch Lieferung"
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Wenn Sie beim Beschaffungsauftrag für die Einstellung zur Erstellung einer "
-#~ "Rechnung \"Manuelle Rechnung\" gewählt haben, können Sie hier "
-#~ "nachvollziehen, für welche Auftragspositionen Sie bislang noch keine "
-#~ "Rechnung von Ihrem Lieferanten bekommen haben. Sobald Sie dann eine "
-#~ "Eingangsrechnung empfangen, können Sie auch eine Eingangsrechnung zunächst "
-#~ "im Status Entwurf auf Basis der Auftragspositionen über dieses Menü "
-#~ "erstellen."
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Nicht berechnete Produktzugänge"
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index c87b3ff983d..5fcb83f83fb 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "Προορισμός"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -116,7 +116,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -139,7 +139,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Δεν υπάρχει Τιμοκατάλογος!"
@@ -233,7 +233,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -280,7 +280,7 @@ msgid "Notes"
msgstr "Σημειώσεις"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -354,7 +354,7 @@ msgid "Cancelled"
msgstr "Ακυρωμένη"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -408,7 +408,7 @@ msgid "Reference"
msgstr "Παραπομπή"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -431,7 +431,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -448,8 +448,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -486,7 +486,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Λάθος ΜΟΜ Προϊόντος"
@@ -586,7 +586,7 @@ msgid "Order Lines"
msgstr "Γραμμές Παραγγελίας"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Δεν υπάρχει Συνεργάτης!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
msgstr "Προορσιμός Κράτησης"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Άκυρη Ενέργεια!"
@@ -773,7 +773,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -784,7 +784,7 @@ msgid "Manual"
msgstr "Μη Αυτόματη"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -900,7 +900,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1104,7 +1103,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1121,14 +1120,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Δεν έχει δηλωθεί λογαριασμός εξόδων για το προϊόν: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1177,7 +1176,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1443,7 +1442,7 @@ msgid "Date Approved"
msgstr "Ημερ/νία Έγκρισης"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!"
@@ -1555,7 +1554,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!"
@@ -1699,7 +1698,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1776,7 +1775,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1830,16 +1829,6 @@ msgstr ""
#~ msgid "From Picking"
#~ msgstr "Από Συλλογή"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Παρακαλώ, σημειώστε ότι οι παραγγελίες θα συγχωνευθούν μόνο αν προέρχονται "
-#~ "από τον ίδιο προμηθευτή και έχουν τον ίδιο προορισμό. Οι γραμμές θα "
-#~ "συγχωνευθούν μόνο αν είναι ολόιδιες, με εξαίρεση τις ποσότητες και τις "
-#~ "μονάδες μέτρησης."
-
#~ msgid "Packing"
#~ msgstr "Συσκευασία"
@@ -1855,9 +1844,6 @@ msgstr ""
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Παραγγελίες Αγορών σε Εξέλιξη"
-#~ msgid "N°"
-#~ msgstr "N°"
-
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Η Παραγγελία Αγοράς επιβεβαιώθηκε από το χρήστη"
@@ -2028,10 +2014,6 @@ msgstr ""
#~ msgid "From Packing list, Create invoice."
#~ msgstr "Δημιουργία Τιμολογίου από Κατάσταση Συσκευασίας"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Δεν μπορείτε να έχετε 2 εκδόσεις τιμοκαταλόγου που αλληλοκαλύπτονται!"
-
#~ msgid "Approving Purchase Order"
#~ msgstr "Έγκριση Παραγγελιών Αγοράς"
@@ -2048,12 +2030,3 @@ msgstr ""
#~ msgid "Date"
#~ msgstr "Ημερομηνία"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Χειροκίνητο σε εξέλιξη"
-
-#~ msgid "Quotation"
-#~ msgstr "Προσφορά"
-
-#~ msgid "In progress"
-#~ msgstr "Σε εξέλιξη"
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 47b5fa79292..934482f6b8f 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -760,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1675,7 +1674,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f8d6d8bba80..16e79d63699 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
"confirmado."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
msgstr "Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -128,7 +128,7 @@ msgstr ""
"productos recibidos, y controlar las facturas de los proveedores."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -151,7 +151,7 @@ msgid "From a Pick list"
msgstr "Desde un albarán"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "¡No tarifa!"
@@ -244,7 +244,7 @@ msgid "Partial Picking"
msgstr "Albarán parcial"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Pedido de compra '%s' está confirmado."
@@ -291,7 +291,7 @@ msgid "Notes"
msgstr "Notas"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Importe de compra por encima del límite"
@@ -423,7 +423,7 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
@@ -445,7 +445,7 @@ msgid "Day"
msgstr "Día"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
@@ -462,8 +462,8 @@ msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -500,7 +500,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "¡UdM del producto errónea!"
@@ -605,7 +605,7 @@ msgid "Order Lines"
msgstr "Líneas del pedido"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "¡Falta empresa!"
@@ -660,9 +660,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Facturas generadas para un pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
msgstr "Destinación de la reserva"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "¡Acción no válida!"
@@ -811,7 +811,7 @@ msgid " Month-1 "
msgstr " Mes-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, 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)"
@@ -822,7 +822,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -945,7 +945,6 @@ msgid "Month"
msgstr "Mes"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Esperando aceptación proveedor"
@@ -1151,7 +1150,7 @@ msgid "Manual Invoices"
msgstr "Facturas manuales"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1169,7 +1168,7 @@ msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1177,7 +1176,7 @@ msgstr ""
"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1235,7 +1234,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1506,7 +1505,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "¡No se puede cancelar este pedido de compra!"
@@ -1621,7 +1620,7 @@ msgid "Total Qty and Amount by month"
msgstr "Ctdad total y importe por mes"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "¡No se puede cancelar el pedido de compra!"
@@ -1788,7 +1787,7 @@ msgstr ""
"cancela un pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "El pedido de compra '%s' está cancelado."
@@ -1868,7 +1867,7 @@ msgid "Partner"
msgstr "Empresa"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1918,9 +1917,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Tablero de compras"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
#, python-format
#~ msgid ""
#~ "You have to select a pricelist in the purchase form !\n"
@@ -1943,15 +1939,6 @@ msgstr "Tablero de compras"
#~ msgid "From Picking"
#~ msgstr "Desde albarán"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la "
-#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad."
-
#~ msgid "Packing"
#~ msgstr "Empaquetado/Albarán"
@@ -1967,9 +1954,6 @@ msgstr "Tablero de compras"
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Pedidos de compra en proceso"
-#~ msgid "N°"
-#~ msgstr "Nº"
-
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Pedido de compra es confirmado por el usuario."
@@ -2145,99 +2129,5 @@ msgstr "Tablero de compras"
#~ "¡Error! No puede asignar la tarifa principal como otra tarifa en un "
#~ "elemento de la tarifa."
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Presupuesto"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando planificación"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Una factura generada por un pedido de compra."
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Líneas de compra no facturadas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Permite acceder a sus registros de proveedores y mantener su relación con "
-#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la "
-#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM del producto"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: "
-#~ "los productos recibidos, la factura recibida y controlada.\n"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Si se establece el control de la facturación de un pedido de compra como "
-#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las "
-#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté "
-#~ "listo para recibir una factura de proveedor, puede generar una factura de "
-#~ "proveedor en borrador basada en las líneas desde este menú."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
-#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
-#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
-#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes "
-#~ "pasos: recepción en borrador de los productos, factura de control."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Utilice este menú para controlar las facturas que se reciban de su "
-#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
-#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
-#~ "puede compararla con la factura borrador y validarla."
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index a1a332e0405..67411069dfa 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr "Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Sin lista de precio !"
@@ -230,7 +230,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -277,7 +277,7 @@ msgid "Notes"
msgstr "notas"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -351,7 +351,7 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -405,7 +405,7 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -427,7 +427,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -444,8 +444,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -482,7 +482,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UdM del producto errónea !"
@@ -582,7 +582,7 @@ msgid "Order Lines"
msgstr "Líneas de la orden"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "No hay partner !"
@@ -631,9 +631,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -691,7 +691,7 @@ msgid "Reservation Destination"
msgstr "Destino de la reserva"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Acción no válida !"
@@ -769,7 +769,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -780,7 +780,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -896,7 +896,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1099,7 +1098,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1116,14 +1115,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "No hay cuenta de gastos definida para este producto: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1171,7 +1170,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1439,7 +1438,7 @@ msgid "Date Approved"
msgstr "Fecha de aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "No se puede cancelar esta orden de compra!"
@@ -1551,7 +1550,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "¡No se puede cancelar la orden de compra!"
@@ -1695,7 +1694,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1772,7 +1771,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1821,15 +1820,6 @@ msgstr ""
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Factura de proveedor pre-generada en la recepción para control"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen al "
-#~ "mismo partner y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son iguales excepto la cantidad y unidad."
-
#~ msgid "Packing"
#~ msgstr "Empaque"
@@ -1845,9 +1835,6 @@ msgstr ""
#~ msgid "Create invoice from product recept"
#~ msgstr "Crear factura desde recepción producto"
-#~ msgid "N°"
-#~ msgstr "Nº"
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Órdenes de compra en proceso"
@@ -1996,9 +1983,6 @@ msgstr ""
#~ msgid "Approved Purchase"
#~ msgstr "Compra aprobada"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de listas de precios que se superpongan!"
-
#~ msgid "Packing Invoice"
#~ msgstr "Facturar remito"
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index 3760c59d5fb..e265357e66c 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
"confirmado."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
msgstr "Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -120,7 +120,7 @@ msgstr ""
"productos recibidos, y controlar las facturas de los proveedores."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -143,7 +143,7 @@ msgid "From a Pick list"
msgstr "Desde un albarán"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "¡No tarifa!"
@@ -236,7 +236,7 @@ msgid "Partial Picking"
msgstr "Albarán parcial"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Pedido de compra '%s' está confirmado."
@@ -283,7 +283,7 @@ msgid "Notes"
msgstr "Notas"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -361,7 +361,7 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Importe de compra por encima del límite"
@@ -415,7 +415,7 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
@@ -437,7 +437,7 @@ msgid "Day"
msgstr "Día"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
@@ -454,8 +454,8 @@ msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -492,7 +492,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "¡UdM del producto errónea!"
@@ -597,7 +597,7 @@ msgid "Order Lines"
msgstr "Líneas del pedido"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "¡Falta empresa!"
@@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Facturas generadas para un pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -719,7 +719,7 @@ msgid "Reservation Destination"
msgstr "Destinación de la reserva"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "¡Acción no válida!"
@@ -803,7 +803,7 @@ msgid " Month-1 "
msgstr " Mes-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, 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)"
@@ -814,7 +814,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
msgstr "Mes"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Esperando aceptación proveedor"
@@ -1138,7 +1137,7 @@ msgid "Manual Invoices"
msgstr "Facturas manuales"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1156,7 +1155,7 @@ msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1164,7 +1163,7 @@ msgstr ""
"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1223,7 +1222,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1494,7 +1493,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "¡No se puede cancelar este pedido de compra!"
@@ -1609,7 +1608,7 @@ msgid "Total Qty and Amount by month"
msgstr "Ctdad total y importe por mes"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "¡No se puede cancelar el pedido de compra!"
@@ -1776,7 +1775,7 @@ msgstr ""
"cancela un pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "El pedido de compra '%s' está cancelado."
@@ -1856,7 +1855,7 @@ msgid "Partner"
msgstr "Empresa"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1912,9 +1911,6 @@ msgstr "Tablero de compras"
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Líneas de compra no facturadas"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
#, python-format
#~ msgid ""
#~ "You have to select a pricelist in the purchase form !\n"
@@ -1934,15 +1930,6 @@ msgstr "Tablero de compras"
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Factura de proveedor pre-generada en la recepción para control"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la "
-#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad."
-
#~ msgid "Packing"
#~ msgstr "Empaquetado/Albarán"
@@ -1958,9 +1945,6 @@ msgstr "Tablero de compras"
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Pedidos de compra en proceso"
-#~ msgid "N°"
-#~ msgstr "Nº"
-
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Pedido de compra es confirmado por el usuario."
@@ -2135,97 +2119,3 @@ msgstr "Tablero de compras"
#~ msgstr ""
#~ "¡Error! No puede asignar la tarifa principal como otra tarifa en un "
#~ "elemento de la tarifa."
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Presupuesto"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando planificación"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Una factura generada por un pedido de compra."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Permite acceder a sus registros de proveedores y mantener su relación con "
-#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la "
-#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM del producto"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: "
-#~ "los productos recibidos, la factura recibida y controlada.\n"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Si se establece el control de la facturación de un pedido de compra como "
-#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las "
-#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté "
-#~ "listo para recibir una factura de proveedor, puede generar una factura de "
-#~ "proveedor en borrador basada en las líneas desde este menú."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
-#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
-#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
-#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes "
-#~ "pasos: recepción en borrador de los productos, factura de control."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Utilice este menú para controlar las facturas que se reciban de su "
-#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
-#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
-#~ "puede compararla con la factura borrador y validarla."
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index c42d975a303..91790da2c7c 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -28,7 +28,7 @@ msgstr ""
"confirmado."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -47,7 +47,7 @@ msgid "Destination"
msgstr "Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -130,7 +130,7 @@ msgstr ""
"productos recibidos, y el control de las facturas de proveedores."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -153,7 +153,7 @@ msgid "From a Pick list"
msgstr "Desde inventario"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "¡No tarifa!"
@@ -246,7 +246,7 @@ msgid "Partial Picking"
msgstr "Movimientos parciales"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Pedido de compra '%s' está confirmado."
@@ -293,7 +293,7 @@ msgid "Notes"
msgstr "Notas"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -423,7 +423,7 @@ msgid "Reference"
msgstr "Referencia"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "No se puede borrar las Ordenes de Compra que estan en estado %s !"
@@ -445,7 +445,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -462,8 +462,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -600,7 +600,7 @@ msgid "Order Lines"
msgstr "Líneas del pedido"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -649,9 +649,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -709,7 +709,7 @@ msgid "Reservation Destination"
msgstr "Destinación de la reserva"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -787,7 +787,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -798,7 +798,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -914,7 +914,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1117,7 +1116,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1134,14 +1133,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1188,7 +1187,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1456,7 +1455,7 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1568,7 +1567,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1712,7 +1711,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1789,7 +1788,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -2024,17 +2023,5 @@ msgstr ""
#~ msgstr ""
#~ "Después del pedido de compra aprobado, se convierte en factura de proveedor"
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Cotización"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando Fecha"
-
#~ msgid "From Picking"
#~ msgstr "Desde inventario"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index c96f3ee87a8..9f90b117261 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -13,11 +13,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Hinnakiri puudub !"
@@ -46,7 +46,7 @@ msgid "From Order"
msgstr "Tellimusest"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Vigane tegevus !"
@@ -78,7 +78,7 @@ msgid "Invoicing Control"
msgstr "Arveldamishaldus"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -98,7 +98,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -116,7 +116,7 @@ msgid "Destination"
msgstr "Sihtpunkt"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -186,7 +186,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -295,7 +295,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -342,7 +342,7 @@ msgid "Notes"
msgstr "Märkused"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -398,7 +398,7 @@ msgid "Cancelled"
msgstr "Tühistatud"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -452,7 +452,7 @@ msgid "Reference"
msgstr "Viide"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -474,7 +474,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -491,8 +491,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -529,7 +529,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Vale toote MÜ!"
@@ -629,7 +629,7 @@ msgid "Order Lines"
msgstr "Korralduse read"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Puudub partner!"
@@ -678,9 +678,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -799,7 +799,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -810,7 +810,7 @@ msgid "Manual"
msgstr "Käsitsi"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -926,7 +926,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1129,7 +1128,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1146,14 +1145,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Sellele tootele pole määratud kulukontot: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1202,7 +1201,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1463,7 +1462,7 @@ msgid "Date Approved"
msgstr "Heaks kiitmise kuupäev"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Seda ostukorraldust ei saa tühistada !"
@@ -1570,7 +1569,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Ostukorraldust ei saa tühistada !"
@@ -1704,7 +1703,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1819,9 +1818,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr ""
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni mis kattuvad!"
-
#, python-format
#~ msgid ""
#~ "You have to select a pricelist in the purchase form !\n"
@@ -1839,9 +1835,6 @@ msgstr ""
#~ msgid "Purchase Process"
#~ msgstr "Ostuprotseduur"
-#~ msgid "N°"
-#~ msgstr "N°"
-
#~ msgid "Planned Date"
#~ msgstr "Planeeritud kuupäev"
@@ -1886,15 +1879,6 @@ msgstr ""
#~ msgid "From Picking"
#~ msgstr "Noppest"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Pane tähele, et korraldused liidetakse ainult siis, kui nad lähevad samale "
-#~ "partnerile ja samasse kohta. Read liidetakse ainult siis, kui nad on täpselt "
-#~ "samad välja arvatud kogus ja ühik."
-
#~ msgid "Packing"
#~ msgstr "Pakkimine"
@@ -2025,15 +2009,3 @@ msgstr ""
#~ msgid "Date"
#~ msgstr "Kuupäev"
-
-#~ msgid "Quotation"
-#~ msgstr "Hinnapakkumine"
-
-#~ msgid "In progress"
-#~ msgstr "Hetkel toimumas"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Ootegraafik"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Edenemisel käsitsi"
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index aa89bc410cf..b959189e770 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,12 +23,14 @@ msgid ""
"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
"becomes a confirmed Purchase Order."
msgstr ""
+"Ostajan on hyväksyttävä tarjouspyyntö ennen toimittajalle lähettämistä. "
+"Tarjouspyynnöstä tulee hyväksytty ostotilaus."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr ""
+msgstr "Et voi vahvistaa ostotilausta ilman ostotilausrivejä."
#. module: purchase
#: field:purchase.order,invoiced:0
@@ -43,7 +45,7 @@ msgid "Destination"
msgstr "Kohde"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -69,6 +71,13 @@ msgid ""
"supplier invoices: based on the order, based on the receptions or manual "
"encoding."
msgstr ""
+"Voit luoda tarjouspyynnön jos haluat ostaa tuotteita toimittajalta, mutta "
+"ostoa ei ole vielä vahvisttu. Voit käyttää tätä valikkoa myös "
+"tarkastellaksesi automaattisesti luotuja tarjouspyyntöjä jotka pohjautuvat "
+"logistiikkasääntöihisi (minimivarasto, MTO jne.) Voit muuntaa tarjouspyynnön "
+"ostotilaukseksi kun tilaus on vahvistettu. Jos käytät laajennettua liittymää "
+"(käyttäjäasetukset), voit valita tavan jolla hallitaan toimittajien laskuja: "
+"tilauksen pohjalta, vastaanoton pohjalta tai käsin syöttäen."
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -112,9 +121,12 @@ msgid ""
"products, etc. For each purchase order, you can track the products received, "
"and control the supplier invoices."
msgstr ""
+"Käytä tätä valikkoa etsiäksesi ostotilauksia viitteiden, toimittajien, "
+"tuotteiden yms. perusteella. Jokaista ostotilausta kohden, voit seurata "
+"vastaanotettuja tuotteita ja hallita toimittajien laskuja"
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -137,7 +149,7 @@ msgid "From a Pick list"
msgstr "Keräilylistalta"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Ei hinnastoa!"
@@ -229,7 +241,7 @@ msgid "Partial Picking"
msgstr "Osittainen keräily"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Ostotilaus '%s' on vahvistettu."
@@ -276,12 +288,14 @@ msgid "Notes"
msgstr "Huomautukset"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
"Please set one before choosing a product."
msgstr ""
+"Sinun pitää valita hinnasto tai toimittaja ostolomakkeella !\n"
+"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
#. module: purchase
#: selection:purchase.report,month:0
@@ -352,7 +366,7 @@ msgid "Cancelled"
msgstr "Peruttu"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Ostomäärä ylittää rajan"
@@ -406,7 +420,7 @@ msgid "Reference"
msgstr "Viite"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Ostotilausta jonka tila on %s ei voi poistaa."
@@ -428,7 +442,7 @@ msgid "Day"
msgstr "Päivä"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Ostotilaus '%s' on asetettu vedokseksi."
@@ -445,8 +459,8 @@ msgid "# of Lines"
msgstr "Rivien lukumäärä"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -483,7 +497,7 @@ msgid "It indicates that a picking has been done"
msgstr "Merkitsee että keräilylista on tehty"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Väärä tuotteen mittayksikkö!"
@@ -587,7 +601,7 @@ msgid "Order Lines"
msgstr "Tilausrivit"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Ei kumppania!"
@@ -629,6 +643,11 @@ msgid ""
"Manual: allows you to generate suppliers invoices by chosing in the "
"uninvoiced lines of all manual purchase orders."
msgstr ""
+"Tilaukselta: luonnoslasku luodaan ostotilauksen perusteella. Kirjanpitäjän "
+"pitä vain tarkistaa ja hyväksyä lasku.\n"
+"Keräilystä: luonnoslasku luodaan tarkastetun vastaanoton perusteella.\n"
+"Käsin (manuaalinen): mahdollistaa toimittajalaskujen luonnin käsin "
+"laskuttamattomilta riveiltä kaikista manuaalisista ostotilauksisa."
#. module: purchase
#: help:purchase.order,invoice_ids:0
@@ -636,9 +655,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Ostotilaukselle luodut laskut"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -666,6 +685,9 @@ msgid ""
"purchase history and performance. From this menu you can track your "
"negotiation performance, the delivery performance of your suppliers, etc."
msgstr ""
+"ostoanalyysi mahdollistaa helpon tarkastelun yrityksesi ostohistoriasta ja "
+"tehokkuukdesta. Tästä valikosta voit seurata neuvottelujen onnistumista, "
+"toimittajien toimituskykyä yms."
#. module: purchase
#: view:purchase.order:0
@@ -679,6 +701,9 @@ msgid ""
"order is 'On picking'. The invoice can also be generated manually by the "
"accountant (Invoice control = Manual)."
msgstr ""
+"Lasku on luotu automaattisesti, jos laskukontrolli ostotilauksessa on "
+"'keräilystä'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta "
+"(laskukontrolli=manuaalinen)"
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -696,7 +721,7 @@ msgid "Reservation Destination"
msgstr "Varausmääränpää"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Virheellinen toiminto!"
@@ -749,6 +774,10 @@ msgid ""
"according to your settings. Once you receive a supplier invoice, you can "
"match it with the draft invoice and validate it."
msgstr ""
+"Käytä tätä valikkoa kontrolloidaksesi laskuja joita saapuu toimittajiltasi. "
+"OpeneERP luo esilaskut jotka perustuvat ostotilauksiin tai vastaanottoihin, "
+"asetusten mukaisesti. Kun vastaanotat toimittajan laskun, voit kohdistaa ja "
+"täsmäyttää sen luonnoslakusn kanssa."
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -776,10 +805,11 @@ msgid " Month-1 "
msgstr " Kuukausi-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
+"Tälle yritykselle ei ole määritelty ostojen päiväkirjaa: \"%s\" (id:%d)"
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -787,7 +817,7 @@ msgid "Manual"
msgstr "Manuaalinen"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -809,7 +839,7 @@ msgstr "Hallittavat sisääntulevat tuotteet"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
msgid "Approbation"
-msgstr ""
+msgstr "Hyväksyntä"
#. module: purchase
#: view:purchase.report:0
@@ -824,6 +854,10 @@ msgid ""
"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
"can generate a draft supplier invoice based on the lines from this menu."
msgstr ""
+"Jos asetat ostotilauksen laskukontrollin tilaan manuaalinen, voit seurata "
+"täällä kaikkia ostotilausrivejä joista et ole vielä vastaanottanut "
+"toimittajan laskua. Kun olet valmis vastaanottamaan toimittajan laskun, voit "
+"luoda luonnostilassa olevan toimittajalaskun tämän valikon rivien pohjalta."
#. module: purchase
#: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -905,7 +939,6 @@ msgid "Month"
msgstr "Kuukausi"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Odottaa toimittajan vahvistusta"
@@ -1050,6 +1083,9 @@ msgid ""
"the buyer. Depending on the Invoicing control of the purchase order, the "
"invoice is based on received or on ordered quantities."
msgstr ""
+"Ostotilaus luo toimittajalaskun heti kun se on vahvistettu ostajan toimesta. "
+"Riippuen laskujen kontrollista ostotilauksella, lasku perustuu "
+"vastaanotettuihin tai tilattuihin määriin."
#. module: purchase
#: field:purchase.order,amount_untaxed:0
@@ -1108,7 +1144,7 @@ msgid "Manual Invoices"
msgstr "Käsin Laskutus"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1125,14 +1161,14 @@ msgid "Extended Filters..."
msgstr "Laajennetut Suotimet..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut."
@@ -1179,7 +1215,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1447,7 +1483,7 @@ msgid "Date Approved"
msgstr "Hyväksymispäivämäärä"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Tätä ostotilausta ei voida perua!"
@@ -1519,6 +1555,9 @@ msgid ""
"suppliers. You can track all your interactions with them through the History "
"tab: emails, orders, meetings, etc."
msgstr ""
+"Hallinnoi toimittajatietoja ja pidä yllä hyvät suhteet toimittajiisi. Voit "
+"seurata kaikkia yhteyksiä heiden kanssaan kohdasta Historia: sähköpostit, "
+"tilauset, kokoukset jne."
#. module: purchase
#: view:purchase.order:0
@@ -1559,7 +1598,7 @@ msgid "Total Qty and Amount by month"
msgstr "Kokonaismäärä ja määrä kuukausittain"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Ostotilausta ei voida perua!"
@@ -1570,6 +1609,8 @@ msgid ""
"In case there is no supplier for this product, the buyer can fill the form "
"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
msgstr ""
+"Jos tuotteelle ei ole toimittajaa, ostaja voi täyttää lomakkeen käsin ja "
+"vahvistaa sen. Tarjouspyynnöstä tulee vahvistettu ostotilaus."
#. module: purchase
#: selection:purchase.report,month:0
@@ -1703,7 +1744,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Ostotilaus '%s' on peruttu."
@@ -1767,6 +1808,9 @@ msgid ""
"order is 'On order'. The invoice can also be generated manually by the "
"accountant (Invoice control = Manual)."
msgstr ""
+"Lasku luodaan automaattisesti jos laskujen kontrolli ostotilauksella on "
+"'tilattaessa'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta "
+"(laskujen kontrolli = manuaalinen)."
#. module: purchase
#: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1780,7 +1824,7 @@ msgid "Partner"
msgstr "Kumppani"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1821,6 +1865,8 @@ msgid ""
"unique number of the purchase order,computed automatically when the purchase "
"order is created"
msgstr ""
+"Uniikki numero ostotilauksella, laskettu automaattisesti kun ostotilaus "
+"luodaan"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.open_board_purchase
@@ -1871,30 +1917,15 @@ msgstr "Hankintojen Työtila"
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
-
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Huomioi että tilaukset yhdistetään vain jos ne ovat samalle kumppanille ja "
-#~ "lähetetään samaan paikkaan, ja linjat yhdistetään vain jos ne ovat täysin "
-#~ "samat lukuunottamatta määrää ja mittayksikköä."
-
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
#~ msgid "Create invoice from product recept"
#~ msgstr "Luo lasku tuote vastaanotettaessa"
-#~ msgid "N°"
-#~ msgstr "Nro"
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Ostotilaukset käsittelyssä"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 6f68bdd0cc2..c7fbe495c64 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"au fournisseur. L'appel d'offre devient alors un ordre d'achat confirmé."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
msgstr "Destination"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -129,7 +129,7 @@ msgstr ""
"suivre les produits reçus et contrôler les factures du fournisseur."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Le fournisseur sélectionné peut seulement vendre ce produit par %s"
@@ -152,7 +152,7 @@ msgid "From a Pick list"
msgstr "À la réception"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Pas de Liste de Prix !"
@@ -246,7 +246,7 @@ msgid "Partial Picking"
msgstr "Traitement partiel"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "L'ordre d'achat '%s' est confirmé."
@@ -293,7 +293,7 @@ msgid "Notes"
msgstr "Notes"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -373,7 +373,7 @@ msgid "Cancelled"
msgstr "Annulé"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Montant d'achat supérieur à la limite"
@@ -427,7 +427,7 @@ msgid "Reference"
msgstr "Référence"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Impossible de supprimer des bons de commande dans l'état %s !"
@@ -449,7 +449,7 @@ msgid "Day"
msgstr "Jour"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "L'ordre d'achat '%s' a été passé au statut 'Brouillon'."
@@ -466,8 +466,8 @@ msgid "# of Lines"
msgstr "# de lignes"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -504,7 +504,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UdM Produit incorrecte !"
@@ -610,7 +610,7 @@ msgid "Order Lines"
msgstr "Lignes de la commande"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Pas de Partenaire !"
@@ -665,9 +665,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Factures générées pour un bon de commande"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -732,7 +732,7 @@ msgid "Reservation Destination"
msgstr "Destination de la réservation"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Action non valide !"
@@ -817,7 +817,7 @@ msgid " Month-1 "
msgstr " Mois -1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -830,7 +830,7 @@ msgid "Manual"
msgstr "Manuel"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -952,7 +952,6 @@ msgid "Month"
msgstr "Mois"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "En attente de confirmation du fournisseur"
@@ -1162,7 +1161,7 @@ msgid "Manual Invoices"
msgstr "Factures manuelles"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1181,7 +1180,7 @@ msgid "Extended Filters..."
msgstr "Filtres étendus..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1189,7 +1188,7 @@ msgstr ""
"Il n'y a pas de compte de charge définit pour ce produit : \"%s\" (id. : %d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1249,7 +1248,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1520,7 +1519,7 @@ msgid "Date Approved"
msgstr "Date approbation"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Impossible d'annuler cette commande d'achat !"
@@ -1635,7 +1634,7 @@ msgid "Total Qty and Amount by month"
msgstr "Quantité totale et montant total par mois"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Impossible d'annuler le bon de commande !"
@@ -1802,7 +1801,7 @@ msgstr ""
"bon de commande."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "L'ordre d'achat '%s' est annulé."
@@ -1882,7 +1881,7 @@ msgid "Partner"
msgstr "Partenaire"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1932,20 +1931,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Tableau de bord des achats"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent"
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Veuillez noter que les commandes ne seront fusionnées que si elles sont "
-#~ "destinées au même partenaire et vont à la même zone de stockage, et que les "
-#~ "lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf "
-#~ "pour la quantité et l'unité"
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Ordres d'achat en cours"
@@ -2150,23 +2135,11 @@ msgstr "Tableau de bord des achats"
#~ msgid "Product recept invoice"
#~ msgstr "Facture de Réception du Produit"
-#~ msgid "Quotation"
-#~ msgstr "Devis"
-
#~ msgid "Date"
#~ msgstr "Date"
-#~ msgid "In progress"
-#~ msgstr "En cours"
-
#~ msgid "From Picking"
#~ msgstr "Sur marchandise reçue"
-#~ msgid "To be Invoiced"
-#~ msgstr "À facturer"
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Lignes d'achat non facturées"
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM du produit"
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 87d634bae25..523c705095a 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -760,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1675,7 +1674,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 683b87830fe..47dfe9843c5 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,35 +24,36 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr ""
+msgstr "Ne možete potvrditi narudžbu bez stavaka."
#. module: purchase
#: field:purchase.order,invoiced:0
msgid "Invoiced & Paid"
-msgstr ""
+msgstr "Fakturirano i plaćeno"
#. module: purchase
#: field:purchase.order,location_id:0
#: view:purchase.report:0
#: field:purchase.report,location_id:0
msgid "Destination"
-msgstr ""
+msgstr "Odredište"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
"of the product"
msgstr ""
+"Zadana jedinica mjere mora biti u istoj kategoriji kao nabavna jedinica mjere"
#. module: purchase
#: help:purchase.report,date:0
msgid "Date on which this document has been created"
-msgstr ""
+msgstr "Datum izrade dokumenta"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -75,12 +76,12 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Not Invoiced"
-msgstr ""
+msgstr "Nefakturirano"
#. module: purchase
#: field:purchase.order,dest_address_id:0
msgid "Destination Address"
-msgstr ""
+msgstr "Adresa odredišta"
#. module: purchase
#: report:purchase.order:0
@@ -111,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -157,7 +158,7 @@ msgstr ""
#: view:purchase.report:0
#: field:purchase.report,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
#. module: purchase
#: view:board.board:0
@@ -169,7 +170,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi kao nacrt"
#. module: purchase
#: selection:purchase.order,state:0
@@ -220,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -267,7 +268,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +342,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -395,7 +396,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -417,7 +418,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -434,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -472,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -498,7 +499,7 @@ msgstr ""
#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
#: view:purchase.order.line_invoice:0
msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -572,7 +573,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -621,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -681,7 +682,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -759,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -770,7 +771,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -884,7 +885,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1087,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1104,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1158,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1317,7 +1317,7 @@ msgstr ""
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
#. module: purchase
#: view:purchase.order:0
@@ -1418,7 +1418,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1530,7 +1530,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1674,7 +1674,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1751,7 +1751,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 38dd12566a6..7e84ab57e64 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-02-09 18:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +27,7 @@ msgstr ""
"szállítónak. Az ajánlatkérés egy megerősített szállítói megrendeléssé válik."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Nem erősíthet meg sorok nélküli szállítói megrendelést."
@@ -44,7 +45,7 @@ msgid "Destination"
msgstr "Célállomás"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +128,7 @@ msgstr ""
"a bejövő számlákat."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -150,7 +151,7 @@ msgid "From a Pick list"
msgstr "Bevételezési lista alapján"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Nincs árlista !"
@@ -240,7 +241,7 @@ msgid "Partial Picking"
msgstr "Részleges bevételezés"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "'%s' szállítói megrendelés megerősítésre került."
@@ -287,7 +288,7 @@ msgid "Notes"
msgstr "Megjegyzések"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -366,7 +367,7 @@ msgid "Cancelled"
msgstr "Érvénytelenített"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "A limitet meghaladó beszerzési összeg"
@@ -420,7 +421,7 @@ msgid "Reference"
msgstr "Hivatkozás"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "%s állapotban lévő szállítói megrendelés(eke)t nem lehet törölni!"
@@ -442,7 +443,7 @@ msgid "Day"
msgstr "Nap"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "'%s' szállítói megrendelés tervezet állapotba beállításra került."
@@ -459,8 +460,8 @@ msgid "# of Lines"
msgstr "Sorok száma"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -497,7 +498,7 @@ msgid "It indicates that a picking has been done"
msgstr "Jelzi, hogy a bevételezést végrehajtották."
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Rossz termék ME!"
@@ -603,7 +604,7 @@ msgid "Order Lines"
msgstr "Megrendelés sorok"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Nincs partner!"
@@ -658,9 +659,9 @@ msgid "Invoices generated for a purchase order"
msgstr "A szállítói megrendelés alapján készített számlák"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -725,7 +726,7 @@ msgid "Reservation Destination"
msgstr "Foglalás rendeltetési helye"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Érvénytelen művelet !"
@@ -809,7 +810,7 @@ msgid " Month-1 "
msgstr " Előző hónap "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "\"%s\" (kód: %d) vállalatra nem állítottak be bejövő számla naplót."
@@ -820,7 +821,7 @@ msgid "Manual"
msgstr "Kézi"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -942,7 +943,6 @@ msgid "Month"
msgstr "Hónap"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Szállító visszaigazolására váró"
@@ -1148,7 +1148,7 @@ msgid "Manual Invoices"
msgstr "Kézi számlák"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1167,7 +1167,7 @@ msgid "Extended Filters..."
msgstr "Kiterjesztett szűrők…"
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1175,7 +1175,7 @@ msgstr ""
"\"%s\" (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1235,7 +1235,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1506,7 +1506,7 @@ msgid "Date Approved"
msgstr "Jóváhagyás dátuma"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Nem érvényteleníthető ez a szállítói megrendelés!"
@@ -1618,7 +1618,7 @@ msgid "Total Qty and Amount by month"
msgstr "Havi összes mennyiség és végösszeg"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Nem érvényteleníthető a szállítói megrendelés!"
@@ -1785,7 +1785,7 @@ msgstr ""
"érvényteleníti a megrendelést."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "'%s' szállítói megrendelés érvénytelenítésre került."
@@ -1865,7 +1865,7 @@ msgid "Partner"
msgstr "Partner"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -2097,15 +2097,6 @@ msgstr "Beszerzési vezérlőpult"
#~ msgid "Approving Purchase Order"
#~ msgstr "Beszerzési rendelés jóváhagyása"
-#~ msgid ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "\"\n"
-#~ "\"Please set one partner before choosing a product."
-#~ msgstr ""
-#~ "Önnek ki kell választania egy partnert a beszerzési űrlapon !\n"
-#~ "\"\n"
-#~ "\"Kérem adjon meg egy partnert mielőtt választ egy terméket."
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Nem számlázott beszerzés sorok"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 3cde6f2958f..bfd0f679837 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"pembelian yang telah dikonfirmasi."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "Tujuan"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
"diterima, dan mengkontrol faktur pemasok"
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -150,7 +150,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Tidak ada daftar harga !"
@@ -241,7 +241,7 @@ msgid "Partial Picking"
msgstr "Pengambilan Sebagian"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Order Pembelian '%s' telah dikonfirmasi"
@@ -288,7 +288,7 @@ msgid "Notes"
msgstr "Catatan"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -367,7 +367,7 @@ msgid "Cancelled"
msgstr "Dibatalkan"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -421,7 +421,7 @@ msgid "Reference"
msgstr "Referensi"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Tidak dapat menghapus Purchase Order yang berada di bagian %s"
@@ -443,7 +443,7 @@ msgid "Day"
msgstr "Hari"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "'% s' Order pembelian telah diatur di bagian draft."
@@ -460,8 +460,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -498,7 +498,7 @@ msgid "It indicates that a picking has been done"
msgstr "Hal ini menunjukkan bahwa pengambilan telah dilakukan"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Produk UoM Salah !"
@@ -603,7 +603,7 @@ msgid "Order Lines"
msgstr "Daftar Order"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Rekanan Tidak ada"
@@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Faktur dibuat untuk pesanan pembelian"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -718,7 +718,7 @@ msgid "Reservation Destination"
msgstr "Reservasi Tujuan"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Tindakan tidak valid !"
@@ -802,7 +802,7 @@ msgid " Month-1 "
msgstr " Bulan - 1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -814,7 +814,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1141,7 +1140,7 @@ msgid "Manual Invoices"
msgstr "Faktur secara manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1160,7 +1159,7 @@ msgid "Extended Filters..."
msgstr "Filter Tambahan"
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1168,7 +1167,7 @@ msgstr ""
"Tidak ada account beban yang ditetapkan untuk produk ini \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1217,7 +1216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1485,7 +1484,7 @@ msgid "Date Approved"
msgstr "Tanggal Disetujui"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Order Pembelian tidak dapat dibatalkan"
@@ -1600,7 +1599,7 @@ msgid "Total Qty and Amount by month"
msgstr "Total Qty dan Jumlah berdasarkan bulan"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Order Pembelian tidak dapat dibatalkan !"
@@ -1747,7 +1746,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Order Pembelian '%s' dibatalkan."
@@ -1824,7 +1823,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index e56e5809a44..bd23cef86d6 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"fornitore. Il preventivo diverrà quindi un ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
msgstr "Destinazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -117,7 +117,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -140,7 +140,7 @@ msgid "From a Pick list"
msgstr "Da una lista di prelievo"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Nessun Listino Prezzi !"
@@ -233,7 +233,7 @@ msgid "Partial Picking"
msgstr "Prelievo parziale"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "L'ordine di acquisto '%s' è confermato."
@@ -280,7 +280,7 @@ msgid "Notes"
msgstr "Note"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -360,7 +360,7 @@ msgid "Cancelled"
msgstr "Annullato"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Costo d' acquisto sopra il limite consentito"
@@ -414,7 +414,7 @@ msgid "Reference"
msgstr "Referenza"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -437,7 +437,7 @@ msgid "Day"
msgstr "Giorno"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "L'ordine di acquisto '%s' è stato riportato allo stato bozza."
@@ -454,8 +454,8 @@ msgid "# of Lines"
msgstr "Numero di linee"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done"
msgstr "Indica che è stato eseguito un movimento merci"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UOM del prodotto errata!"
@@ -598,7 +598,7 @@ msgid "Order Lines"
msgstr "Righe Ordine"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Nessun partner!"
@@ -654,9 +654,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Fatture generate per un ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -721,7 +721,7 @@ msgid "Reservation Destination"
msgstr "Destinazione Prenotata"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Azione non valida !"
@@ -801,7 +801,7 @@ msgid " Month-1 "
msgstr " Mese - 1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -814,7 +814,7 @@ msgid "Manual"
msgstr "Manuale"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
msgstr "Mese"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "In attesa della risposta del fornitore"
@@ -1140,7 +1139,7 @@ msgid "Manual Invoices"
msgstr "Fatture manuali"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1159,7 +1158,7 @@ msgid "Extended Filters..."
msgstr "Filtri estesi"
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1167,7 +1166,7 @@ msgstr ""
"Non risulta presente alcun conto definito per questo prodotto:\"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1228,7 +1227,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1501,7 +1500,7 @@ msgid "Date Approved"
msgstr "Data Approvazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Non è possibile cancellare questo ordine di acquisto!"
@@ -1614,7 +1613,7 @@ msgid "Total Qty and Amount by month"
msgstr "Q.tà totale e costo totale per mese"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "L'ordine di acquisto non può essere cancellato !"
@@ -1781,7 +1780,7 @@ msgstr ""
"l'utente cancella l'ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "L'ordine di acquisto '%s' è cancellato."
@@ -1861,7 +1860,7 @@ msgid "Partner"
msgstr "Partner"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1911,23 +1910,9 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Dashboard acquisti"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Non puoi avere due versioni dello stesso listino che si sovrappongono"
-
#~ msgid "From Picking"
#~ msgstr "Da Prelievo"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Attenzione: gli ordini verranno fusi esclusivamente se sono rivolti al "
-#~ "medesimo fornitore e destinati allo stesso punto di stoccaggio. Le righe "
-#~ "verranno unite esclusivamente nel caso in cui risultassero identiche, ad "
-#~ "eccezione di quantità e unità di misura."
-
#~ msgid "Create invoice from product recept"
#~ msgstr "Creare fattura da ricezione prodotti"
@@ -2086,66 +2071,5 @@ msgstr "Dashboard acquisti"
#~ msgid "Purchase Order lines"
#~ msgstr "Righe Ordine Acquisto"
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Se si imposta il controllo della fatturazione su un ordine di acquisto come "
-#~ "\"Manuale\", è possibile tener traccia qui delle linee degli ordini di "
-#~ "acquisto per cui non si è ancora ricevuta la fattura del fornitore. Una "
-#~ "volta che la fattura del fornitore è pervenuta è possibile, da questo menu, "
-#~ "generare una fattura fornitore in formato bozza basata su queste linee."
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Da fatturare"
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Linee di acquisto non fatturate"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "Dal menu Ordini di Acquisto è possibile tracciare lo stato dei propri "
-#~ "ordini: merci ricevute, fatture pervenute e controllate.\n"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "È possibile utilizzare questo menu per controllare le fatture che devono "
-#~ "essere ricevute dal fornitore. OpenERP pre-genera le fatture in stato bozza "
-#~ "partendo dagli ordini di vendita o dalle ricezioni merci. Una volta ricevuta "
-#~ "una fattura d'acquisto è possibile verificarne la congruenza con la fattura "
-#~ "pre-generata in formato bozza e quindi validarla."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Mediante il menu di richiesta preventivo è possibile creare nuovi "
-#~ "preventivi, gestire quelli già presenti e confermarli, convertendoli quindi "
-#~ "in ordini effettivi, non appena perviene l'approvazione da parte del "
-#~ "fornitore. Quanto una richiesta di preventivo viene confermata, OpenERP si "
-#~ "occuperà di convertirla in ordine di acquisto e di generare tutti i passi "
-#~ "successivi necessari: ricezione dei prodotti da approvare, controllo delle "
-#~ "fatturazioni."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Possibilità di accesso ai record dei propri fornitori e di gestione delle "
-#~ "relazioni con essi. È possibili tenere traccia dei contatti intercorsi con i "
-#~ "fornitori attraverso il tab storia: email, ordini, riunioni, etc."
-
-#~ msgid "Product UoM"
-#~ msgstr "UoM del prodotto"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 735fe0c6b20..8125fef08b1 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "목적지"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "가격리스트가 없음!"
@@ -221,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
msgstr "노트"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
msgstr "취소됨"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
msgstr "참조"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "잘못된 상품 UOM !"
@@ -573,7 +573,7 @@ msgid "Order Lines"
msgstr "주문 라인"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "파트너가 없음!"
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
msgstr "예약 목적지"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "유효하지 않은 액션!"
@@ -760,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
msgstr "매뉴얼"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "이 상품을 위해 정의된 비용 계정이 없습니다: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr "먼저 이 구매 주문에 첨부된 모든 인보이스를 취소해야 합니다."
@@ -1159,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1422,7 +1421,7 @@ msgid "Date Approved"
msgstr "승인된 날짜"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "이 구매 주문을 취소할 수 없습니다 !"
@@ -1534,7 +1533,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "구매 주문을 취소할 수 없습니다 !"
@@ -1678,7 +1677,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1755,7 +1754,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1807,14 +1806,6 @@ msgstr ""
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "컨트롤을 위한 접수 상에서 미리 생성된 공급자 인보이스"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "주문들은 동일한 파트너 및 동일한 위치를 향할 때만 합병될 수 있으며, 라인들은 수량과 유닛 외에는 정확히 동일할 경우에만 합쳐질 수 "
-#~ "있습니다."
-
#~ msgid "From Picking"
#~ msgstr "피킹으로부터"
@@ -1827,9 +1818,6 @@ msgstr ""
#~ msgid "Create invoice from product recept"
#~ msgstr "제품 수령으로부터 인보이스 생성"
-#~ msgid "N°"
-#~ msgstr "N°"
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "진행 중인 구매 주문"
@@ -1988,9 +1976,6 @@ msgstr ""
#~ msgid "Purchase Invoice"
#~ msgstr "구매 인보이스"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "중복되는 두 가격리스트 버전들은 허용되지 않습니다."
-
#~ msgid "From Packing list, Create invoice."
#~ msgstr "포장 리스트로부터 인보이스 생성"
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 14eb20b5406..1b11c7c2f1b 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr "Paskirties vieta"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Nėra kainoraščio!"
@@ -224,7 +224,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -271,7 +271,7 @@ msgid "Notes"
msgstr "Pastabos"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -345,7 +345,7 @@ msgid "Cancelled"
msgstr "Nutrauktas"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -399,7 +399,7 @@ msgid "Reference"
msgstr "Nuoroda"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -421,7 +421,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -438,8 +438,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Netinkamas produkto mato vnt.!"
@@ -576,7 +576,7 @@ msgid "Order Lines"
msgstr "Užsakymo eilutės"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Nėra partnerio!"
@@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -685,7 +685,7 @@ msgid "Reservation Destination"
msgstr "Rezervacijos vieta"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Netinkamas veiksmas!"
@@ -763,7 +763,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -774,7 +774,7 @@ msgid "Manual"
msgstr "Rankinis"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -888,7 +888,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1091,7 +1090,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1108,14 +1107,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1164,7 +1163,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1424,7 +1423,7 @@ msgid "Date Approved"
msgstr "Patvirtinimo data"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Negalima atšaukti šio pirkimo užsakymo!"
@@ -1536,7 +1535,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Negalima atšaukti pirkimo užsakymo!"
@@ -1680,7 +1679,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1757,7 +1756,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1805,9 +1804,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr ""
-#~ msgid "N°"
-#~ msgstr "N°"
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Vykdomi pirkimų užsakymai"
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 0c0e7592538..f5f249b7e1d 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Хаана"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
msgstr "Түүврийн жагсаалтаас"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Үнийн хүснэгтгүй !"
@@ -228,7 +228,7 @@ msgid "Partial Picking"
msgstr "Дутуу түүвэр"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Батлагдсан '%s' худалдан авалтын захиалга."
@@ -275,7 +275,7 @@ msgid "Notes"
msgstr "Тэмдэглэл"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -349,7 +349,7 @@ msgid "Cancelled"
msgstr "Цуцалсан"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -403,7 +403,7 @@ msgid "Reference"
msgstr "Дугаар"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "%s төлөвт байгаа захиалгыг устгах боломжгүй!"
@@ -425,7 +425,7 @@ msgid "Day"
msgstr "Өдөр"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -442,8 +442,8 @@ msgid "# of Lines"
msgstr "# Мөрийн"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -480,7 +480,7 @@ msgid "It indicates that a picking has been done"
msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -580,7 +580,7 @@ msgid "Order Lines"
msgstr "Захиалгын мөрүүд"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Харилцагчгүй!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
msgstr "Нөөц хүргэх хаяг"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Алдаатай үйлдэл !"
@@ -773,7 +773,7 @@ msgid " Month-1 "
msgstr " Сар-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -784,7 +784,7 @@ msgid "Manual"
msgstr "Гараар"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -899,7 +899,6 @@ msgid "Month"
msgstr "Сар"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1102,7 +1101,7 @@ msgid "Manual Invoices"
msgstr "Нэхэмжлэх заавар"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1119,14 +1118,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Энэ бараанд зарлагын данс алга:\"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1173,7 +1172,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1439,7 +1438,7 @@ msgid "Date Approved"
msgstr "Зөвшөөрсөн огноо"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Энэ худалдан авалтын захиалгыг цуцалж чадсангүй !"
@@ -1552,7 +1551,7 @@ msgid "Total Qty and Amount by month"
msgstr "Нийт тоо ширхэг болон хэмжээ (сараар)"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Худалдан авалтын захиалга цуцалж чадсангүй!"
@@ -1704,7 +1703,7 @@ msgstr ""
"order."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Худалдан авалтын захиалга '%s' цуцлагдсан."
@@ -1781,7 +1780,7 @@ msgid "Partner"
msgstr "Харилцагч"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1997,15 +1996,6 @@ msgstr "Худалдан авалт"
#~ msgid "Product Receipt"
#~ msgstr "Барааны баримт"
-#~ msgid "Waiting Schedule"
-#~ msgstr "Хүлээх төлөвлөгөө"
-
-#~ msgid "In progress"
-#~ msgstr "Үргэлжилж байна"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Гарын авлага үргэлжилж байна"
-
#~ msgid "Control invoices on receptions"
#~ msgstr "Ирэх нэхэмжлэлийг удирдах"
@@ -2018,57 +2008,14 @@ msgstr "Худалдан авалт"
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Хүлээн авалт дээр нийлүүлэгчийн нэхэмжлэл үүснэ"
-#~ msgid "Extended filters..."
-#~ msgstr "Өргөтгөсөн шүүлтүүр..."
-
-#~ 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"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-#~ msgstr ""
-#~ "Захиалгаас: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "Түүврээс: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-
-#~ msgid ""
-#~ "There is no expense account defined ' \\n "
-#~ " 'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Зардлын данс тодорхойлогдоогүй байна ' \\n "
-#~ " 'энэ барааны \"%s\" (id:%d)"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Нэхэмжлэнэ"
-
-#~ msgid "Нийлүүлэгчийн нэхэмжлэл хүлээж авах"
-#~ msgstr "Нийлүүлэгчийн нэхэмжлэл хүлээж авах"
-
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Дэлгэцийн архитектур алдаатай!"
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр"
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
#~ msgid "When controlling invoice from orders"
#~ msgstr "Захиалгаас нэхэмжлэл үүсгэх үед"
#~ msgid "Purchase order is approved by supplier."
#~ msgstr "Нийлүүлэгч захиалгыг зөвшөөрсөн."
-
-#~ msgid "Quotation"
-#~ msgstr "Үнийн санал"
-
-#~ msgid "Product UoM"
-#~ msgstr "Хэмжих нэгж"
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 2092846d971..7a74edaeba0 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "Destinasjon"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr "Fra en plukkliste"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Ingen prisliste!"
@@ -223,7 +223,7 @@ msgid "Partial Picking"
msgstr "Delvis plukking"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Innkjøpsordre '%s' er bekreftet."
@@ -270,7 +270,7 @@ msgid "Notes"
msgstr "Notater"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -344,7 +344,7 @@ msgid "Cancelled"
msgstr "Annulert"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Innkjøpsbeløp er over grenseverdien"
@@ -398,7 +398,7 @@ msgid "Reference"
msgstr "Referanse"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -420,7 +420,7 @@ msgid "Day"
msgstr "Dag"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -437,8 +437,8 @@ msgid "# of Lines"
msgstr "# linjer"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -475,7 +475,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Feil måleenhet for produkt!"
@@ -575,7 +575,7 @@ msgid "Order Lines"
msgstr "Ordrelinjer"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Ingen klient definert!"
@@ -629,9 +629,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Faktura generert for en innkjøpsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -689,7 +689,7 @@ msgid "Reservation Destination"
msgstr "Reservasjonsmål"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Ugyldig aksjon!"
@@ -767,7 +767,7 @@ msgid " Month-1 "
msgstr " Måned-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -779,7 +779,7 @@ msgid "Manual"
msgstr "Manuell"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr "Du må først avbryte all plukking relatert til denne innkjøpsordren."
@@ -893,7 +893,6 @@ msgid "Month"
msgstr "Måned"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,7 +1112,7 @@ msgid "Extended Filters..."
msgstr "Utvidede filter..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1121,7 +1120,7 @@ msgstr ""
"Det er ikke definert noen kostnadskonto for dette produktet: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1169,7 +1168,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1429,7 +1428,7 @@ msgid "Date Approved"
msgstr "Godkjent dato"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Kunne ikke annulere denne innkjøpsordren !"
@@ -1541,7 +1540,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Kunne ikke annulere innkjøpsordre!"
@@ -1685,7 +1684,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Innkjøpsordre '%s' er annulert."
@@ -1762,7 +1761,7 @@ msgid "Partner"
msgstr "Partner"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 06a4abfb2bd..189e6349460 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
"inkooporder."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "U kunt een inkooporder zonder orderregels niet bevestigen."
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "Bestemming"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
"producten volgen en inkoopfacturen beheren."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -150,7 +150,7 @@ msgid "From a Pick list"
msgstr "van een piklijst"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Geen prijslijst!"
@@ -243,7 +243,7 @@ msgid "Partial Picking"
msgstr "Deels gepikt"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Inkooporder '%s' is bevestigd."
@@ -290,7 +290,7 @@ msgid "Notes"
msgstr "Notities"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -370,7 +370,7 @@ msgid "Cancelled"
msgstr "Geannuleerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Inkoopbedrag boven de limiet"
@@ -424,7 +424,7 @@ msgid "Reference"
msgstr "Referentie"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Kan geen inkooporder(s) verwijderen die in status %s zijn !"
@@ -446,7 +446,7 @@ msgid "Day"
msgstr "Dag"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Inkooporder '%s' is in concept status gezet."
@@ -463,8 +463,8 @@ msgid "# of Lines"
msgstr "# Regels"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -501,7 +501,7 @@ msgid "It indicates that a picking has been done"
msgstr "Het geeft aan dat een picking is uitgevoerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Verkeerde product meeteenheid !"
@@ -606,7 +606,7 @@ msgid "Order Lines"
msgstr "Orderregels"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Geen relatie geselecteerd!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Facturen voor een inkooporder gegenereerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
msgstr "Gereserveerde bestemming"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Foutieve handeling!"
@@ -809,7 +809,7 @@ msgid " Month-1 "
msgstr " Maand-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "Er is geen inkoopdagboek gedefinieerd in dit bedrijf: \"%s\" (id:%d)"
@@ -820,7 +820,7 @@ msgid "Manual"
msgstr "Handmatig"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -940,7 +940,6 @@ msgid "Month"
msgstr "Maand"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Wacht lever. bevest."
@@ -1149,7 +1148,7 @@ msgid "Manual Invoices"
msgstr "Handmatige facturen"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1168,7 +1167,7 @@ msgid "Extended Filters..."
msgstr "Uitgebreide filters..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1176,7 +1175,7 @@ msgstr ""
"Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1234,7 +1233,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1502,7 +1501,7 @@ msgid "Date Approved"
msgstr "Datum goedgekeurd"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Inkooporder kan niet geannuleerd worden."
@@ -1617,7 +1616,7 @@ msgid "Total Qty and Amount by month"
msgstr "Totaal aantal en bedrag per maand"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Inkooporder kan niet worden geannuleerd!"
@@ -1785,7 +1784,7 @@ msgstr ""
"inkooporder annuleert."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Inkooporder '%s' is geannuleerd."
@@ -1865,7 +1864,7 @@ msgid "Partner"
msgstr "Relatie"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1915,9 +1914,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Inkoop dashboard"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Twee overlappende prijslijsten is niet mogelijk!"
-
#~ msgid "Product recept invoice"
#~ msgstr "Product-ontvangst factuur"
@@ -1934,15 +1930,6 @@ msgstr "Inkoop dashboard"
#~ msgid "From Picking"
#~ msgstr "Van ontvangsten"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Alleen orders met dezelfde leverancier en met dezelfde bestemming worden "
-#~ "samengevoegd. Tevens moeten de regels exact hetzelfde zijn (uitgezonderd "
-#~ "aantallen)."
-
#~ msgid "Packing"
#~ msgstr "Verpakking"
@@ -1955,9 +1942,6 @@ msgstr "Inkoop dashboard"
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Lopende inkooporders"
-#~ msgid "N°"
-#~ msgstr "Nr."
-
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Inkooporder is goedgekeurd door de gebruiker."
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index bea5f4d3470..25f6526e97a 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -759,7 +759,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1674,7 +1673,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 99672259fbc..7b56ee94c59 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"dostawcy. Zapytanie ofertowe stanie się potwierdzonym zamówieniem zakupu."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji."
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Przeznaczenie"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -123,7 +123,7 @@ msgstr ""
"itd. W zamówieniu zakupu możesz przeglądać produkty i sprawdzać stan faktur."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -146,7 +146,7 @@ msgid "From a Pick list"
msgstr "Z pobrania"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Brak cennika !"
@@ -237,7 +237,7 @@ msgid "Partial Picking"
msgstr "Pobranie częściowe"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Zamówienie zakupu '%s' zostało potwierdzone"
@@ -284,7 +284,7 @@ msgid "Notes"
msgstr "Uwagi"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -363,7 +363,7 @@ msgid "Cancelled"
msgstr "Anulowano"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Wartość zakupu powyżej limitu"
@@ -417,7 +417,7 @@ msgid "Reference"
msgstr "Odnośnik"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Nie można usuwać zamówień zakupu, które są w stanie %s !"
@@ -439,7 +439,7 @@ msgid "Day"
msgstr "Dzień"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Zamówienie zakupu '%s' zostało ustawione w stan Projekt"
@@ -456,8 +456,8 @@ msgid "# of Lines"
msgstr "# pozycji"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -494,7 +494,7 @@ msgid "It indicates that a picking has been done"
msgstr "To oznacza, że pobranie zostało wykonane"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Niepoprawna JM produktu !"
@@ -598,7 +598,7 @@ msgid "Order Lines"
msgstr "Pozycje zamówienia"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Brak partnera!"
@@ -653,9 +653,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Faktury wygenerowane do zamówienia zakupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -718,7 +718,7 @@ msgid "Reservation Destination"
msgstr "Miejsce docelowe rezerwacji"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Niedozwolona akcja !"
@@ -801,7 +801,7 @@ msgid " Month-1 "
msgstr " Miesiąc-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "Brak dziennika zakupów dla tej firmy: \"%s\" (id:%d)"
@@ -812,7 +812,7 @@ msgid "Manual"
msgstr "Ręczne"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -934,7 +934,6 @@ msgid "Month"
msgstr "Miesiąc"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Oczekuje potwierdzenia dostawcy"
@@ -1141,7 +1140,7 @@ msgid "Manual Invoices"
msgstr "Ręczne faktury"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1158,7 +1157,7 @@ msgid "Extended Filters..."
msgstr "Rozszerzone filtry..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1166,7 +1165,7 @@ msgstr ""
"Nie zdefiniowano konta rozchodowego dla tego produktu: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1223,7 +1222,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1493,7 +1492,7 @@ msgid "Date Approved"
msgstr "Data aprobowania"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Nie można anulować tego zamówienia zakupu !"
@@ -1608,7 +1607,7 @@ msgid "Total Qty and Amount by month"
msgstr "Suma ilości i kwot wg miesięcu"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Nie można anulować zamówienia zakupu !"
@@ -1772,7 +1771,7 @@ msgstr ""
"* Stan 'Anulowano' jest ustawiany po anulowaniu zamówienia."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Zamówienia zakupu '%s' zostało anulowane."
@@ -1852,7 +1851,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1973,9 +1972,6 @@ msgstr "Konsola zakupów"
#~ msgid "After Purchase order , Create invoice."
#~ msgstr "Po zamówieniu zakupu utwórz fakturę."
-#~ msgid "N°"
-#~ msgstr "Nr"
-
#~ msgid "Invoice based on deliveries"
#~ msgstr "Faktura wg dostaw"
@@ -1995,21 +1991,9 @@ msgstr "Konsola zakupów"
#~ "Moduł do zarządzania zakupami\n"
#~ " Zapytanie ofertowe, Tworzenie faktury zakupu, Druk zamówienia..."
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !"
-
#~ msgid "Approving Purchase Order"
#~ msgstr "Aprobowanie zamówień sprzedaży"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Zamówienia będą łączone tylko wtedy, jeśli są do tego samego partnera i do "
-#~ "tej samej strefy magazynowej, a pozycje będą łaczone tylko wtedy jeśli są "
-#~ "takie same z wyjątkiem ilości i jednostki miary."
-
#~ msgid "Request For Quotations"
#~ msgstr "Zapytania ofertowe"
@@ -2103,18 +2087,6 @@ msgstr "Konsola zakupów"
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Faktura dostawcy wygenerowana przy przyjęciu dla kontroli"
-#~ msgid "Manual in progress"
-#~ msgstr "Ręczne w toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Oferta"
-
-#~ msgid "In progress"
-#~ msgstr "W toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Czeka na planowanie"
-
#~ msgid "Packing"
#~ msgstr "Pobranie"
@@ -2142,84 +2114,5 @@ msgstr "Konsola zakupów"
#~ msgid "When purchase order is approved , it creates its packing list."
#~ msgstr "Kiedy zamówienie zakupu jest zaaprobowane, to jest tworzone pobranie"
-#~ msgid "To be Invoiced"
-#~ msgstr "Do zafakturowania"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Jeśli ustawisz fakturowanie w zamówieniu zakupu jako \"Ręcznie\", to "
-#~ "będziesz mógł wyszukiwać pozycje zamówień zakupu, dla których dostawca nie "
-#~ "wystawił faktury. Jeśli się spodziewasz faktury od dostawcy, to możesz "
-#~ "wygenerować projekt faktury od dostawcy na podstawie pozycji z tego menu."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Faktura wygenerowana dla zamówienia zakupu"
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Pozycje zakupów nie zafakturowane"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "W menu Zamówienia zakupu możesz sprawdzać stany zamówień: przyjęcia "
-#~ "produktów i zafakturowanie pozycji.\n"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Nazwa grupy musi być unikalna !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "Product UoM"
-#~ msgstr "JM produktu"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "W menu Zapytania ofertowe możesz tworzyć nowe zapytania ofertowe, przeglądać "
-#~ "je i potwierdzać kiedy dostawca aprobuje zamówienie. Po potwierdzeniu "
-#~ "zapytania OpenERP skonwertuje je do zamówienia zakupu i wygeneruje następne "
-#~ "dokumenty: przyjęcie zewnętrzne i projekt faktury."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Dostęp do historii relacji z dostawcą. Możesz przeglądać: wiadomości, "
-#~ "zamówienia, spotkania itp."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Stosuj to menu do sprawdzania faktur otrzymywanych od dostawców. OpenERP "
-#~ "generuje projekty faktur na podstawie twoich zamówień zakupu lub przyjęć. "
-#~ "Kiedy otrzymasz fakturę od dostawcy, to możesz ją skonfrontować z projektami "
-#~ "faktur i zatwierdzić."
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 4ef1b193df2..058659c9e8e 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"fornecedor. A cotação torna-se numa ordem de compra confirmada."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Não pode confirmar uma ordem de compra sem linhas."
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -114,7 +114,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -137,7 +137,7 @@ msgid "From a Pick list"
msgstr "A partir das receções"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Sem lista de preços"
@@ -230,7 +230,7 @@ msgid "Partial Picking"
msgstr "Receção parcial"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "A ordem de compra '%s' está confirmada."
@@ -277,7 +277,7 @@ msgid "Notes"
msgstr "Notas"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -353,7 +353,7 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Montante acima do limite"
@@ -407,7 +407,7 @@ msgid "Reference"
msgstr "Referência"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Não pode eliminar ordens de compra no estado %s!"
@@ -429,7 +429,7 @@ msgid "Day"
msgstr "Dia"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "A ordem de compra '%s' passou ao estado rascunho."
@@ -446,8 +446,8 @@ msgid "# of Lines"
msgstr "# de Linhas"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -484,7 +484,7 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que a receção foi feita"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UdM Errada!"
@@ -586,7 +586,7 @@ msgid "Order Lines"
msgstr "Lindas da ordem"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Sem parceiro!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
msgstr "Destino da reserva"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Acção Inválida!"
@@ -775,7 +775,7 @@ msgid " Month-1 "
msgstr " Mês-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -787,7 +787,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -904,7 +904,6 @@ msgid "Month"
msgstr "Mês"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Aguarda ação do fornecedor"
@@ -1110,7 +1109,7 @@ msgid "Manual Invoices"
msgstr "Faturação Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1127,7 +1126,7 @@ msgid "Extended Filters..."
msgstr "Filtros extendidos ..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1135,7 +1134,7 @@ msgstr ""
"Não existe nenhuma conta de despesa definida para este artigo: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1184,7 +1183,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1450,7 +1449,7 @@ msgid "Date Approved"
msgstr "Data de aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Não é possivel cancelar esta ordem de compra !"
@@ -1562,7 +1561,7 @@ msgid "Total Qty and Amount by month"
msgstr "Quantidades e valores por mês"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Não é possivel cancelar a ordem de compra !"
@@ -1706,7 +1705,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "A ordem de compra '%s' foi cancelada."
@@ -1783,7 +1782,7 @@ msgid "Partner"
msgstr "Parceiro"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1831,9 +1830,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr ""
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter duas versões da lista de preços que se sobrepõem!"
-
#~ msgid "Purchase Process"
#~ msgstr "Processo de compra"
@@ -1867,15 +1863,6 @@ msgstr ""
#~ msgid "Approved Purchase"
#~ msgstr "Compra aprovada"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor note que as ordens só serão juntadas se forem do mesmo terceiro e "
-#~ "estiverem a ir na mesma posição, e as linhas serão juntadas se forem "
-#~ "exactamente os mesmos à excepção da quantidade e da unidade."
-
#~ msgid "Merge purchases"
#~ msgstr "Juntar compras"
@@ -2048,47 +2035,14 @@ msgstr ""
#~ "Precisa primeiro cancelar todas as embalagens anexadas para esta ordem de "
#~ "compra."
-#~ msgid "To be Invoiced"
-#~ msgstr "A ser facturado"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
#~ 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."
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
-
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML inválido para a arquitectura da vista!"
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Linhas de ordens de compra não faturadas"
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "A partir do menu 'Ordens de compra' pode seguir a situação das suas ordens: "
-#~ "artigos recebidos; Fatura recebida e verificada.\n"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Use este menu para controlar as faturas recebidas dos fornecedores. O "
-#~ "OpenERP gera faturas 'rascunho' com base nas ordens de compra ou nas "
-#~ "recepções. Assim que receber uma fatura, pode verifica-la contra a a fatura "
-#~ "rascunho e confirmá-la."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM do artigo"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Uma fatura gerada por ordem de compra"
-
#~ msgid "From Picking"
#~ msgstr "A partir da receção"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 8fb034b9764..f951c832743 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
"se torna um Pedido de compra confirmado."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
msgstr "Local Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -129,7 +129,7 @@ msgstr ""
"controlar as faturas do fornecedor."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -152,7 +152,7 @@ msgid "From a Pick list"
msgstr "Da Lista de Separação"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Sem Lista de Preços !"
@@ -245,7 +245,7 @@ msgid "Partial Picking"
msgstr "Separação Parcial"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "O pedido de compra '%s' está confirmado."
@@ -292,7 +292,7 @@ msgid "Notes"
msgstr "Observações"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -372,7 +372,7 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Valor de compra acima do limite."
@@ -426,7 +426,7 @@ msgid "Reference"
msgstr "Referência"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Ordem(ns) de Compra com Status em %s não podem ser deletados"
@@ -448,7 +448,7 @@ msgid "Day"
msgstr "Dia"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "O Pedido de Compra '%s' foi colocado em Provisório."
@@ -465,8 +465,8 @@ msgid "# of Lines"
msgstr "# de Linhas"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -503,7 +503,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UdM do Produto errada !"
@@ -609,7 +609,7 @@ msgid "Order Lines"
msgstr "Linhas do Pedido"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Sem Parceiro!"
@@ -664,9 +664,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Faturas geradas para um pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -731,7 +731,7 @@ msgid "Reservation Destination"
msgstr "Reserva Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Ação Inválida !"
@@ -815,7 +815,7 @@ msgid " Month-1 "
msgstr " Mês-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "Não há diário de compras definido para esta empresa: \"%s\" (id:%d)"
@@ -826,7 +826,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -948,7 +948,6 @@ msgid "Month"
msgstr "Mês"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Aguardando Confirmação do Fornecedor"
@@ -1154,7 +1153,7 @@ msgid "Manual Invoices"
msgstr "Faturamento Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1171,7 +1170,7 @@ msgid "Extended Filters..."
msgstr "Filtros Extendidos..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1179,7 +1178,7 @@ msgstr ""
"No existe conta de despesas definida para este produto: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1238,7 +1237,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1511,7 +1510,7 @@ msgid "Date Approved"
msgstr "Data da Aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Não é possível cancelar esta ordem de compra!"
@@ -1626,7 +1625,7 @@ msgid "Total Qty and Amount by month"
msgstr "Total Qtd e Valor por Mês"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Não foi possível cancelar o pedido de compra!"
@@ -1791,7 +1790,7 @@ msgstr ""
"* The 'Cancelled' state is set automatically when user cancel purchase order."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Pedido de compra '%s' está cancelado."
@@ -1871,7 +1870,7 @@ msgid "Partner"
msgstr "Parceiro"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1921,18 +1920,12 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Painel de Compras"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter 2 listas de preços que sobrepoem!"
-
#~ msgid "Confirm Purchase Order"
#~ msgstr "Confirmar Ordem de Compra"
#~ msgid "Order Ref"
#~ msgstr "Ref. Pedido"
-#~ msgid "N°"
-#~ msgstr "Nº"
-
#, python-format
#~ msgid ""
#~ "You have to select a pricelist in the purchase form !\n"
@@ -1990,15 +1983,6 @@ msgstr "Painel de Compras"
#~ msgid "Supplier Invoice pre-generated on receptions for control"
#~ msgstr "Fatura do fornecedor pré-gerada nos recebimentos para controle"
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor note que as ordens só serão agrupadas se forem do mesmo parceiro e "
-#~ "estiverem indo para mesma localidade, e as linhas serão agrupadas se forem "
-#~ "exatamente iguais, com exceção da quantidade e da unidade."
-
#~ msgid "Confirmed Purchase"
#~ msgstr "Compra Confirmada"
@@ -2050,98 +2034,12 @@ msgstr "Painel de Compras"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nome do modelo inválido na definição da ação."
-#~ msgid "Extended filters..."
-#~ msgstr "Extended filters..."
-
-#~ msgid "To Invoice"
-#~ msgstr "Para Faturar"
-
-#~ 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"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-#~ msgstr ""
-#~ "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"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-
-#~ msgid "Quotation Request"
-#~ msgstr "Requisição de Cotação"
-
-#~ msgid "This Year"
-#~ msgstr "Este Ano"
-
-#~ msgid "Launch"
-#~ msgstr "Executar"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ " Please note that:\n"
-#~ "\n"
-#~ " Orders will only be merged if: \n"
-#~ " * Purchase Orders are in draft \n"
-#~ " * Purchase Orders belong to the same supplier \n"
-#~ " * Purchase Orders are have same stock location, same pricelist \n"
-#~ "\n"
-#~ " Lines will only be merged if: \n"
-#~ " * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ " Please note that:\n"
-#~ "\n"
-#~ " Orders will only be merged if: \n"
-#~ " * Purchase Orders are in draft \n"
-#~ " * Purchase Orders belong to the same supplier \n"
-#~ " * Purchase Orders are have same stock location, same pricelist \n"
-#~ "\n"
-#~ " Lines will only be merged if: \n"
-#~ " * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ "\n"
-
-#~ msgid "Total Quantity per product"
-#~ msgstr "Total Quantity per product"
-
#~ msgid "You cannot have 2 pricelist versions that overlap!"
#~ msgstr "You cannot have 2 pricelist versions that overlap!"
-#~ msgid "Purchase Lines not Invoiced"
-#~ msgstr "Linhas de Ordens de Compras não Faturadas"
-
-#~ msgid "# of Products"
-#~ msgstr "# de Produtos"
-
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalid XML for View Architecture!"
-#~ msgid "Draft Purchases"
-#~ msgstr "Compras em Rascunho"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "An invoice generated for a purchase order"
-
-#~ msgid "Purchase Profile : Install Extra Modules"
-#~ msgstr "Purchase Profile : Install Extra Modules"
-
-#~ msgid "Inventory Control"
-#~ msgstr "Controle de Inventário"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar menu recursivo."
-
-#~ msgid "7 Days"
-#~ msgstr "7 Dias"
-
#~ msgid "Delivery & Invoices"
#~ msgstr "Entrega & Faturamento"
@@ -2163,22 +2061,6 @@ msgstr "Painel de Compras"
#~ msgid "Scheduled date"
#~ msgstr "Data Prevista"
-#~ msgid ""
-#~ "Manages your Purchase Requisition and allow you to easily keep track and "
-#~ "manage all your purchase orders."
-#~ msgstr ""
-#~ "Manages your Purchase Requisition and allow you to easily keep track and "
-#~ "manage all your purchase orders."
-
-#~ msgid "Picking"
-#~ msgstr "Separação"
-
-#~ msgid "This Month"
-#~ msgstr "Este Mês"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
-
#~ msgid "Purchase Order lines"
#~ msgstr "Linhas da Ordem de Compra"
@@ -2245,27 +2127,9 @@ msgstr "Painel de Compras"
#~ msgid "Purchase order is confirmed by the user."
#~ msgstr "Ordem de compra confirmada pelo usuário."
-#~ msgid "Manual in progress"
-#~ msgstr "Em andamento manual"
-
-#~ msgid "Quotation"
-#~ msgstr "Cotação"
-
-#~ msgid "In progress"
-#~ msgstr "Em andamento"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Aguardando Programação"
-
#~ msgid "Date"
#~ msgstr "Data"
-#~ msgid "To be Invoiced"
-#~ msgstr "A Faturar"
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM do Produto"
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Linhas não faturadas do Pedido de Compra"
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 20958481ac9..d81a7ab10d5 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-04-04 15:03+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"confirmat devine o comandă de aprovizionare."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Nu puteți confirma comanda de aprovizionare fără linii de comandă."
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Destinație"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -126,7 +126,7 @@ msgstr ""
"urmări produsele recepționate și controla facturile primite de la furnizori."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -149,7 +149,7 @@ msgid "From a Pick list"
msgstr "Dintr-o lista de preluare"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Fără listă de preţ!"
@@ -243,7 +243,7 @@ msgid "Partial Picking"
msgstr "Parțial preluat"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Comande de aprovizionare '%s' este confirmata."
@@ -290,7 +290,7 @@ msgid "Notes"
msgstr "Note"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -367,7 +367,7 @@ msgid "Cancelled"
msgstr "Anulat"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -421,7 +421,7 @@ msgid "Reference"
msgstr "Referință"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -444,7 +444,7 @@ msgid "Day"
msgstr "Zi"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Comanda de aprovizionare '%s' a fost setata la starea de ciornă."
@@ -461,8 +461,8 @@ msgid "# of Lines"
msgstr "# de linii"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -499,7 +499,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "UM produs greșită!"
@@ -605,7 +605,7 @@ msgid "Order Lines"
msgstr "Poziţii comandă"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Fără partener!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Facturi generate dintr-o comandă de aprovizionare"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -721,7 +721,7 @@ msgid "Reservation Destination"
msgstr "Destinaţie rezervare"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Acţiune invalidă!"
@@ -804,7 +804,7 @@ msgid " Month-1 "
msgstr " Luna-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -815,7 +815,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -931,7 +931,6 @@ msgid "Month"
msgstr "Luna"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1135,7 +1134,7 @@ msgid "Manual Invoices"
msgstr "Facturare manuală"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1152,14 +1151,14 @@ msgid "Extended Filters..."
msgstr "Filtre extinse..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1208,7 +1207,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1476,7 +1475,7 @@ msgid "Date Approved"
msgstr "Dată aprobare"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Nu puteți anula această comandă de aprovizionare!"
@@ -1588,7 +1587,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Nu puteți anula comanda de aprovizionare!"
@@ -1732,7 +1731,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Comanda de aprovizionare '%s' este anulată."
@@ -1812,7 +1811,7 @@ msgid "Partner"
msgstr "Partener"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 310b6825dcc..31e94600839 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"становится подтвержденным заказом на закупку."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Вы не можете подтвердить заказ на закупку без позиций в заказе."
@@ -44,7 +44,7 @@ msgid "Destination"
msgstr "Место назначения"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -118,7 +118,7 @@ msgstr ""
"ТМЦ, и контролировать счета поставщиков."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -141,7 +141,7 @@ msgid "From a Pick list"
msgstr "Из комплектовочного листа"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Нет каталога !"
@@ -234,7 +234,7 @@ msgid "Partial Picking"
msgstr "Частичное комплектование"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Заказ на закупку '%s' подтвержден."
@@ -281,7 +281,7 @@ msgid "Notes"
msgstr "Примечания"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -360,7 +360,7 @@ msgid "Cancelled"
msgstr "Отменено"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Закупленное количество сверх лимита"
@@ -414,7 +414,7 @@ msgid "Reference"
msgstr "Ссылка"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Нельзя удалить Заказ(ы) на закупку в стадии %s !"
@@ -436,7 +436,7 @@ msgid "Day"
msgstr "День"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Заказ на закупку '%s' был установлен в состояние \"Черновик\"."
@@ -453,8 +453,8 @@ msgid "# of Lines"
msgstr "Кол-во позиций"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -491,7 +491,7 @@ msgid "It indicates that a picking has been done"
msgstr "Показывает, что комплектование выполнено."
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Неверная ед. изм."
@@ -596,7 +596,7 @@ msgid "Order Lines"
msgstr "Позиции заказа"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Нет партнера!"
@@ -645,9 +645,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Счета созданные для заказа на закупку"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -705,7 +705,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Неверное действие !"
@@ -785,7 +785,7 @@ msgid " Month-1 "
msgstr " Месяц-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr "Журнал закупок не определен для этой компании: \"%s\" (id:%d)"
@@ -796,7 +796,7 @@ msgid "Manual"
msgstr "Вручную"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -914,7 +914,6 @@ msgid "Month"
msgstr "Месяц"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Ожидание"
@@ -1118,7 +1117,7 @@ msgid "Manual Invoices"
msgstr "Счета вручную"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1135,14 +1134,14 @@ msgid "Extended Filters..."
msgstr "Расширенные фильтры..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1191,7 +1190,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1460,7 +1459,7 @@ msgid "Date Approved"
msgstr "Дата утверждения"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Не удалось отменить этот заказ на закупку"
@@ -1572,7 +1571,7 @@ msgid "Total Qty and Amount by month"
msgstr "Общее кол-во и сумма по месяцу"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Не удалось отменить заказ на закупку !"
@@ -1724,7 +1723,7 @@ msgstr ""
"пользователем заказа на закупку."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Заказ на закупку '%s' отменен."
@@ -1804,7 +1803,7 @@ msgid "Partner"
msgstr "Партнер"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1854,18 +1853,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr "Панель закупок"
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Невозможно использовать 2 перекрывающиеся версии каталогов!"
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Учтите, что заказы могут быть объединены, только если они относятся к одному "
-#~ "партнеру и местоположению, а позиции могут быть объединены, только если они "
-#~ "абсолютно одинаковы, кроме количества."
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Выполняемые заказы на закупку"
@@ -2021,15 +2008,6 @@ msgstr "Панель закупок"
#~ msgstr ""
#~ "Предварительно созданный счет поставщика для контроля основанного на заказе"
-#~ msgid "Manual in progress"
-#~ msgstr "Выполняется вручную"
-
-#~ msgid "In progress"
-#~ msgstr "Выполняется"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Расписание ожидания"
-
#~ msgid "From Picking"
#~ msgstr "Из прихода"
@@ -2061,9 +2039,6 @@ msgstr "Панель закупок"
#~ msgid "Request For Quotations"
#~ msgstr "Запрос цен"
-#~ msgid "Quotation"
-#~ msgstr "Предложение (оферта)"
-
#~ msgid ""
#~ "Module for purchase management\n"
#~ " Request for quotation, Create Supplier Invoice, Print Order..."
@@ -2077,47 +2052,5 @@ msgstr "Панель закупок"
#~ msgid "Product Receipt"
#~ msgstr "Получение ТМЦ"
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Если, при заказе на закупку, вы установили метод управления счетами "
-#~ "\"Вручную\", то здесь вы можете отслеживать все позиции заказа на закупку на "
-#~ "которые вы не получили счет от поставщика. При готовности получить счет от "
-#~ "поставщика, вы можете создать черновик счета основанный на позициях заказа "
-#~ "из этого меню."
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Счет будет выставлен"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Счет созданный для заказа на закупку"
-
#~ msgid "Purchase Lines Not Invoiced"
#~ msgstr "Закупаемые позиции без счетов"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Название группы должно быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Product UoM"
-#~ msgstr "Ед. изм. ТМЦ"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются в объектах osv_memory !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index eb93ab484b2..f8a52b51c0e 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Nemôžete potvrdiť objednávku bez objednávky v zozname."
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "Cieľ"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -136,7 +136,7 @@ msgid "From a Pick list"
msgstr "Vyberte zo zoznamu"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Žiadny cenník !"
@@ -222,7 +222,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -269,7 +269,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -343,7 +343,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -397,7 +397,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -419,7 +419,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -436,8 +436,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -574,7 +574,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -683,7 +683,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -761,7 +761,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -772,7 +772,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -886,7 +886,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1089,7 +1088,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1106,14 +1105,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1160,7 +1159,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1420,7 +1419,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1532,7 +1531,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1676,7 +1675,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1753,7 +1752,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index f6cd7ae855a..7791e9a1ba3 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr "Cilj"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Ni cenika!"
@@ -224,7 +224,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -271,7 +271,7 @@ msgid "Notes"
msgstr "Opombe"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -345,7 +345,7 @@ msgid "Cancelled"
msgstr "Preklicano"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -399,7 +399,7 @@ msgid "Reference"
msgstr "Sklic"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -421,7 +421,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -438,8 +438,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -576,7 +576,7 @@ msgid "Order Lines"
msgstr "Postavke naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Ni partnerja!"
@@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -685,7 +685,7 @@ msgid "Reservation Destination"
msgstr "Cilj rezervacije"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Nepravilno dejanje!"
@@ -763,7 +763,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -774,7 +774,7 @@ msgid "Manual"
msgstr "Ročno"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -888,7 +888,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1091,7 +1090,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1108,14 +1107,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1162,7 +1161,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1428,7 +1427,7 @@ msgid "Date Approved"
msgstr "Odobreno dne"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1540,7 +1539,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1684,7 +1683,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1761,7 +1760,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1807,18 +1806,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr ""
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne morete imeti 2 različic cenika, ki se prekrivata."
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Prosim, vedite, da bodo nalogi združeni samo, če so namenjeni istemu "
-#~ "partnerju in lokaciji. Postavke bodo združene samo, če so popolnoma enake, "
-#~ "razen v količini in enoti."
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Nabavni nalogi v teku"
@@ -1868,6 +1855,3 @@ msgstr ""
#~ msgid "Packing"
#~ msgstr "Pakiranje"
-
-#~ msgid "N°"
-#~ msgstr "N°"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index efe6a6db7d9..13ac85a5759 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -760,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1675,7 +1674,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index ddd8b010c7a..b5161e838a0 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "Odredište"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -227,7 +227,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -274,7 +274,7 @@ msgid "Notes"
msgstr "Napomene"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -348,7 +348,7 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -402,7 +402,7 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !"
@@ -424,7 +424,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -441,8 +441,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -579,7 +579,7 @@ msgid "Order Lines"
msgstr "Redovi naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -688,7 +688,7 @@ msgid "Reservation Destination"
msgstr "Odredište rezervacije"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -766,7 +766,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -777,7 +777,7 @@ msgid "Manual"
msgstr "Ručno"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -893,7 +893,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,14 +1112,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1167,7 +1166,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1434,7 +1433,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1546,7 +1545,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1690,7 +1689,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1767,7 +1766,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -2001,15 +2000,3 @@ msgstr ""
#~ msgid "Request For Quotations"
#~ msgstr "Zahtevi za ponudu"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Rucno uredjenje u toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Upit"
-
-#~ msgid "In progress"
-#~ msgstr "U toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Cekanje Zakazanog"
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 51c198f13d7..55e0a79227f 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "Odredište"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -227,7 +227,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -274,7 +274,7 @@ msgid "Notes"
msgstr "Napomene"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -348,7 +348,7 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -402,7 +402,7 @@ msgid "Reference"
msgstr "Referenca"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !"
@@ -424,7 +424,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -441,8 +441,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -579,7 +579,7 @@ msgid "Order Lines"
msgstr "Redovi naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -688,7 +688,7 @@ msgid "Reservation Destination"
msgstr "Odredište rezervacije"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -766,7 +766,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -777,7 +777,7 @@ msgid "Manual"
msgstr "Ručno"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -893,7 +893,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,14 +1112,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1167,7 +1166,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1434,7 +1433,7 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1546,7 +1545,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1690,7 +1689,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1767,7 +1766,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -2001,15 +2000,3 @@ msgstr ""
#~ msgid "Request For Quotations"
#~ msgstr "Zahtevi za ponudu"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Rucno uredjenje u toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Upit"
-
-#~ msgid "In progress"
-#~ msgstr "U toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Cekanje Zakazanog"
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 7ce399da019..c979270cb50 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "Du kan inte bekräfta beställningen utan inköpsorder"
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr "Destination"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
msgstr "Från plocklista"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "No Pricelist !"
@@ -229,7 +229,7 @@ msgid "Partial Picking"
msgstr "Delvis plockning"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Inköpsorder '%s' är bekräftad."
@@ -276,7 +276,7 @@ msgid "Notes"
msgstr "Anteckningar"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -350,7 +350,7 @@ msgid "Cancelled"
msgstr "Cancelled"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -404,7 +404,7 @@ msgid "Reference"
msgstr "Reference"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "Kan inte radera order/ordrar som är i %s tillstånd!"
@@ -426,7 +426,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -443,8 +443,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -481,7 +481,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Wrong Product UOM !"
@@ -581,7 +581,7 @@ msgid "Order Lines"
msgstr "Order Lines"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "No Partner!"
@@ -630,9 +630,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -690,7 +690,7 @@ msgid "Reservation Destination"
msgstr "Reservation Destination"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Invalid action !"
@@ -768,7 +768,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -779,7 +779,7 @@ msgid "Manual"
msgstr "Manual"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -895,7 +895,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1099,7 +1098,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1116,14 +1115,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "There is no expense account defined for this product: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr "You must first cancel all invoices attached to this purchase order."
@@ -1170,7 +1169,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1437,7 +1436,7 @@ msgid "Date Approved"
msgstr "Datum godkänd"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Could not cancel this purchase order !"
@@ -1549,7 +1548,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Could not cancel purchase order !"
@@ -1693,7 +1692,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1770,7 +1769,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index eb6d20c7bea..96044c7e7d1 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
"จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "คุณไม่สามารถยืนยันใบสั่งซื้อที่ไม่มีรายการสั่งซื้อได้"
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "ปลายทาง"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -124,7 +124,7 @@ msgstr ""
"้วเท่าใด"
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -147,7 +147,7 @@ msgid "From a Pick list"
msgstr "สร้างจากใบรับ/จ่ายสินค้า"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "ไม่มีรายการาคา!"
@@ -239,7 +239,7 @@ msgid "Partial Picking"
msgstr "ทยอยส่ง"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว"
@@ -286,7 +286,7 @@ msgid "Notes"
msgstr "บันทึก"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -365,7 +365,7 @@ msgid "Cancelled"
msgstr "ยกเลิกแล้ว"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "จำนวนเงินที่ซื้อเกินขีดจำกัด"
@@ -419,7 +419,7 @@ msgid "Reference"
msgstr "เลขที่"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "ไม่สามารถลบใบสั่งซื้อที่อยู่ในสถานะ %s ได้!"
@@ -441,7 +441,7 @@ msgid "Day"
msgstr "วัน"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "ใบสั่งซื้อ '%s' ถูกเปลี่ยนเป็นสถานะฉบับร่างแล้ว"
@@ -458,8 +458,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -496,7 +496,7 @@ msgid "It indicates that a picking has been done"
msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "หน่วยของสินค้าไม่ถูกต้อง!"
@@ -601,7 +601,7 @@ msgid "Order Lines"
msgstr "รายการสั่งซื้อ"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "ไม่พบผู้จัดจำหน่าย!"
@@ -656,9 +656,9 @@ msgid "Invoices generated for a purchase order"
msgstr "ใบแจ้งหนี้ที่สร้างขึ้นสำหรับการสั่งซื้อ"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -716,7 +716,7 @@ msgid "Reservation Destination"
msgstr "ปลายทางการจอง"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "การกระทำไม่ถูกต้อง !"
@@ -794,7 +794,7 @@ msgid " Month-1 "
msgstr " เดือน - 1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -805,7 +805,7 @@ msgid "Manual"
msgstr "กำหนดเอง"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -920,7 +920,6 @@ msgid "Month"
msgstr "เดือน"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1123,7 +1122,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1140,14 +1139,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1194,7 +1193,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1454,7 +1453,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1566,7 +1565,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1710,7 +1709,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1787,7 +1786,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index ad499e448b0..7718fc53e82 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -759,7 +759,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1674,7 +1673,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 4c8efc204f6..759c376f714 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
"bir Satınalma Siparişi haline gelir."
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
msgstr "Hedef"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
"ürünleri izleyebilir ve tedarikçi faturalarını kontrol edebilirsiniz."
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, 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"
@@ -150,7 +150,7 @@ msgid "From a Pick list"
msgstr "Alım listesinden"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "Fiyat listesi yok!"
@@ -244,7 +244,7 @@ msgid "Partial Picking"
msgstr "Kısmi Alım"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "Satınalma siparişi '%s' onaylandı."
@@ -291,7 +291,7 @@ msgid "Notes"
msgstr "Notlar"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
msgstr "İptal Edildi"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr "Satınalma miktarı limitin üzerinde"
@@ -423,7 +423,7 @@ msgid "Reference"
msgstr "Referans"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "%s Durumundaki Satınalma Sipariş(ler)i silinemez!"
@@ -445,7 +445,7 @@ msgid "Day"
msgstr "Gün"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "Satınalma siparişi '%s' taslak olarak ayarlandı."
@@ -462,8 +462,8 @@ msgid "# of Lines"
msgstr "# / Satır"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -500,7 +500,7 @@ 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:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "Hatalı Birim!"
@@ -606,7 +606,7 @@ msgid "Order Lines"
msgstr "Sipariş Kalemleri"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr "Ortak yok!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
msgstr "Bir satınalma siparişi için oluşturulan faturalar"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
msgstr "Rezervasyon Yeri"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Geçersiz işlem!"
@@ -811,7 +811,7 @@ msgid " Month-1 "
msgstr " Ay-1 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -823,7 +823,7 @@ msgid "Manual"
msgstr "Manuel"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -945,7 +945,6 @@ msgid "Month"
msgstr "Ay"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "Tedarikçi Onayı Bekleniyor"
@@ -1151,7 +1150,7 @@ msgid "Manual Invoices"
msgstr "Manuel Faturalar"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1168,14 +1167,14 @@ msgid "Extended Filters..."
msgstr "Uzatılmış Filtreler..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Bu ürün için belirtilen masraf tutarı yok: \"%s\" (id:%d)"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1234,7 +1233,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1503,7 +1502,7 @@ msgid "Date Approved"
msgstr "Onaylanmış Tarih"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "Bu satınalma siparişi iptal edilemedi!"
@@ -1618,7 +1617,7 @@ msgid "Total Qty and Amount by month"
msgstr "Aylık Toplam Miktar ve Tutar"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "Satınalma siparişi iptal edilemedi!"
@@ -1784,7 +1783,7 @@ msgstr ""
"edildi' durumu ayarlanır."
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "Satınalma siparişi '%s' iptal edildi."
@@ -1864,7 +1863,7 @@ msgid "Partner"
msgstr "Ortak"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index eca571737ee..19e5ee7b75c 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -222,7 +222,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -269,7 +269,7 @@ msgid "Notes"
msgstr "Примітки"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -343,7 +343,7 @@ msgid "Cancelled"
msgstr "Скасовано"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -397,7 +397,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -419,7 +419,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -436,8 +436,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -574,7 +574,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -683,7 +683,7 @@ msgid "Reservation Destination"
msgstr "Ціль резервування"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -761,7 +761,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -772,7 +772,7 @@ msgid "Manual"
msgstr "Ручний"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -886,7 +886,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1089,7 +1088,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1106,14 +1105,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1160,7 +1159,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1426,7 +1425,7 @@ msgid "Date Approved"
msgstr "Затверджена дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1538,7 +1537,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1682,7 +1681,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1759,7 +1758,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1805,16 +1804,6 @@ msgstr ""
msgid "Purchase Dashboard"
msgstr ""
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Зауваження. Замовлення будуть об'єднані лище тоді, коли вони відносяться до "
-#~ "одного партнера і направляються до одного пункту призначення. Рядки будуть "
-#~ "об'єднані лише тоді, коли вони співпадають у всьому, крім кількості та "
-#~ "одиниці виміру."
-
#~ msgid "Purchase Orders in Progress"
#~ msgstr "Заявка на придбання в обробці"
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 10d13529fd8..a893294e197 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-01 04:39+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
msgstr "Điểm đến"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
msgstr "Ghi chú"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
msgstr "Đã hủy bỏ"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
msgstr "Tham chiếu"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
msgstr "Ngày"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "Hành động không hợp lệ!"
@@ -760,7 +760,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
msgstr "Thủ công"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
msgstr "Tháng"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
msgstr "Bộ lọc mở rộng..."
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
msgstr "Ngày được chấp thuận"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1675,7 +1674,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
msgstr "Đối tác"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -1801,21 +1800,12 @@ msgstr ""
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
#~ msgid "You cannot have 2 pricelist versions that overlap!"
#~ msgstr "Bạn không thể có 2 phiên bản bảng giá chồng chéo nhau!"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Tên nhóm phải duy nhất !"
-
#~ msgid ""
#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
#~ "Item!"
@@ -1823,17 +1813,8 @@ msgstr ""
#~ "Lỗi! Bạn không thể chỉ định bảng giá chính là bảng giá khác trong các mục "
#~ "bảng giá!"
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc "
#~ "biệt nào!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
-
-#~ msgid "Product UoM"
-#~ msgstr "Đơn vị đo của sản phẩm"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index b93c40c12f2..c93a7827abf 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -13,18 +13,18 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
msgid ""
"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
"becomes a confirmed Purchase Order."
-msgstr "询价单(RFQ) 必须先得到采购经理核准才能发给供应商。 询价单能确认为采购订单。"
+msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商。 询价单能确认为采购订单。"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr "采购订单无明细,您不能确认。"
@@ -32,7 +32,7 @@ msgstr "采购订单无明细,您不能确认。"
#. module: purchase
#: field:purchase.order,invoiced:0
msgid "Invoiced & Paid"
-msgstr "已开票并付清"
+msgstr "已开票 & 付清"
#. module: purchase
#: field:purchase.order,location_id:0
@@ -42,17 +42,17 @@ msgid "Destination"
msgstr "目的地"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
"of the product"
-msgstr "您选择的产品计量单位与产品的采购单位是同一的类型。"
+msgstr "您选择的产品计量单位要与该产品的采购单位同一的类型。"
#. module: purchase
#: help:purchase.report,date:0
msgid "Date on which this document has been created"
-msgstr "文档生成日期"
+msgstr "单据生成日期"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -66,8 +66,8 @@ msgid ""
"supplier invoices: based on the order, based on the receptions or manual "
"encoding."
msgstr ""
-"当您向供应商购买产品时您能创建一个询价但采购还没确认。询价基于您的后勤规则(最少库存,MTO(按单生产)等)。询价确认后转为采购订单。如果您使用扩展接口("
-"在用户偏好里),您能选择控制供应商开发票的习惯:基于这订单,基于接收或者手动。"
+"当您还没确认采购时您可以先创建一个询价单。询价单基于您的物料规则 (最少库存,MTO(按单生产)等) "
+"自动创建。您能把询价确认后转为采购订单。如果您使用扩展接口(在用户偏好里),您能选择控制供应商的开票方式:基于该订单,基于接收或者手动。"
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -110,10 +110,10 @@ msgid ""
"Use this menu to search within your purchase orders by references, supplier, "
"products, etc. For each purchase order, you can track the products received, "
"and control the supplier invoices."
-msgstr "使用这菜单按关联单号,供应商,产品等搜索您的采购订单,您可以跟踪接收的产品和控制供应商的发票。"
+msgstr "使用这菜单按单号,供应商,产品等搜索您的采购订单,您可以跟踪接收的产品和控制供应商的发票。"
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "选择的供应商只销售这产品 %s"
@@ -136,7 +136,7 @@ msgid "From a Pick list"
msgstr "来自装箱单"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr "没有价格表!"
@@ -151,7 +151,7 @@ msgstr "数量"
#. module: purchase
#: view:purchase.order.line_invoice:0
msgid "Select an Open Sale Order"
-msgstr "选择开启的销售订单"
+msgstr "选择待处理的销售订单"
#. module: purchase
#: field:purchase.order,company_id:0
@@ -195,7 +195,7 @@ msgid ""
"Put an address if you want to deliver directly from the supplier to the "
"customer.In this case, it will remove the warehouse link and set the "
"customer location."
-msgstr "填入一个地址,如果您想直接提供从供应商送货到客户。在这情况下它将删除仓库链接并设定客户库位。"
+msgstr "如果您想直接从供应商送货到客户,请填入地址。在这情况下它将删除仓库链接并设定客户库位。"
#. module: purchase
#: help:res.partner,property_product_pricelist_purchase:0
@@ -214,7 +214,7 @@ msgstr "传真 :"
msgid ""
"The pricelist sets the currency used for this purchase order. It also "
"computes the supplier price for the selected products/quantities."
-msgstr "设定采购订单价格表使用的币别。它还计算出选定产品/数量的供应商价格。"
+msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_partial_picking
@@ -222,7 +222,7 @@ msgid "Partial Picking"
msgstr "部分装箱单"
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr "采购订单 '%s' 已经确认。"
@@ -230,7 +230,7 @@ msgstr "采购订单 '%s' 已经确认。"
#. module: purchase
#: view:purchase.order:0
msgid "Approve Purchase"
-msgstr "批准采购"
+msgstr "审批采购"
#. module: purchase
#: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -238,7 +238,7 @@ msgstr "批准采购"
#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Approved"
-msgstr "已核准"
+msgstr "已审批"
#. module: purchase
#: view:purchase.report:0
@@ -269,19 +269,17 @@ msgid "Notes"
msgstr "备注"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
"Please set one before choosing a product."
-msgstr ""
-"请在采购窗口选择价格表或供应商!\n"
-"然后再选择产品。"
+msgstr "请在采购界面选择价格表或供应商!然后再选择产品。"
#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
-msgstr "9"
+msgstr "9月"
#. module: purchase
#: report:purchase.order:0
@@ -312,7 +310,7 @@ msgstr "单号"
#. module: purchase
#: report:purchase.order:0
msgid "Net Total :"
-msgstr "净总额:"
+msgstr "净合计:"
#. module: purchase
#: view:purchase.installer:0
@@ -335,7 +333,7 @@ msgstr "设置进度"
msgid ""
"A Pick list generates an invoice. Depending on the Invoicing control of the "
"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "装箱单生成一发票,然后这发票控制销售订单,发票是基于交付的或订单上的数量。"
+msgstr "装箱单生成发票,销售订单控制生成的发票,发票是基于已交付或已经下单的数量。"
#. module: purchase
#: selection:purchase.order,state:0
@@ -345,10 +343,10 @@ msgid "Cancelled"
msgstr "已取消"
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
-msgstr "采购金额超过限额"
+msgstr "采购金额超过限定"
#. module: purchase
#: view:purchase.order:0
@@ -391,7 +389,7 @@ msgstr "手动更正"
#. module: purchase
#: view:purchase.report:0
msgid " Month "
-msgstr " 月 "
+msgstr " 月份 "
#. module: purchase
#: view:purchase.order:0
@@ -399,7 +397,7 @@ msgid "Reference"
msgstr "单号"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr "无法删除 %s 状态的采购订单"
@@ -407,7 +405,7 @@ msgstr "无法删除 %s 状态的采购订单"
#. module: purchase
#: field:purchase.report,dest_address_id:0
msgid "Dest. Address Contact Name"
-msgstr "目的地址联系人名"
+msgstr "目的地址联系人姓名"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_move
@@ -421,7 +419,7 @@ msgid "Day"
msgstr "天"
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr "采购订单 “%s” 已经设为草稿"
@@ -438,8 +436,8 @@ msgid "# of Lines"
msgstr "# 明细"
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -476,7 +474,7 @@ msgid "It indicates that a picking has been done"
msgstr "这表示装箱单已完成"
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr "错误的产品计量单位!"
@@ -523,7 +521,7 @@ msgstr "供应商单号"
#. module: purchase
#: help:purchase.order,amount_tax:0
msgid "The tax amount"
-msgstr "税额"
+msgstr "税金"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_productrecept0
@@ -531,7 +529,7 @@ msgid ""
"A Pick list generates a supplier invoice. Depending on the Invoicing control "
"of the purchase order, the invoice is based on received or on ordered "
"quantities."
-msgstr "装箱单生成供应商发票。采购订单控制发票,发票是基于接收或订单的数量。"
+msgstr "装箱单生成供应商发票。采购订单控制发票,发票是基于已接收或已下单数量。"
#. module: purchase
#: view:purchase.order:0
@@ -576,10 +574,10 @@ msgid "Order Lines"
msgstr "订单明细"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
-msgstr "缺少业务伙伴!"
+msgstr "没业务伙伴!"
#. module: purchase
#: report:purchase.quotation:0
@@ -590,7 +588,7 @@ msgstr "传真:"
#: view:purchase.report:0
#: field:purchase.report,price_total:0
msgid "Total Price"
-msgstr "总价格"
+msgstr "总价"
#. module: purchase
#: view:purchase.order:0
@@ -625,12 +623,12 @@ msgstr ""
#. module: purchase
#: help:purchase.order,invoice_ids:0
msgid "Invoices generated for a purchase order"
-msgstr "采购订单的发票已生成"
+msgstr "采购订单的发票已开"
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -688,7 +686,7 @@ msgid "Reservation Destination"
msgstr "预定目的地"
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr "无效动作!"
@@ -703,7 +701,7 @@ msgstr "完成"
#. module: purchase
#: selection:purchase.report,month:0
msgid "July"
-msgstr "7"
+msgstr "7月"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
@@ -731,7 +729,7 @@ msgstr "接收"
#: field:purchase.order,validator:0
#: view:purchase.report:0
msgid "Validated by"
-msgstr "审批人"
+msgstr "审核人"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -741,7 +739,7 @@ msgid ""
"according to your settings. Once you receive a supplier invoice, you can "
"match it with the draft invoice and validate it."
msgstr ""
-"使用这菜单控制您供应商收到的发票。系统根据您的设定从您的采购订单或者收货单生成发票草稿。一旦您收到供应商的发票,您可以匹配发票的草稿并审核它。"
+"使用这菜单控制您从供应商收到的发票。系统根据您的设定从您的采购订单或收货生成发票草稿。一旦您收到供应商的发票,您可以匹配发票的草稿并审核它。"
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -767,10 +765,10 @@ msgid " Month-1 "
msgstr " 上月 "
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr "公司没定义这采购分录序时薄:\"%s\" (id:%d)"
+msgstr "公司没定义这采购账簿:\"%s\" (id:%d)"
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -778,7 +776,7 @@ msgid "Manual"
msgstr "手动"
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr "您必须先取消这采购订单的所有装箱单。"
@@ -798,7 +796,7 @@ msgstr "控制接收的产品"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
msgid "Approbation"
-msgstr "同意"
+msgstr "审批"
#. module: purchase
#: view:purchase.report:0
@@ -813,7 +811,7 @@ msgid ""
"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
"can generate a draft supplier invoice based on the lines from this menu."
msgstr ""
-"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细能生成发票草稿。"
+"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细生成发票草稿。"
#. module: purchase
#: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -831,12 +829,12 @@ msgstr "管理分析配送和采购订单"
msgid ""
"This is computed as the minimum scheduled date of all purchase order lines' "
"products."
-msgstr "这计算所有采购订单明细产品的最小计划日期"
+msgstr "计算所有采购订单明细产品的最小计划日期"
#. module: purchase
#: selection:purchase.report,month:0
msgid "August"
-msgstr "8"
+msgstr "8月"
#. module: purchase
#: field:purchase.installer,purchase_requisition:0
@@ -869,7 +867,7 @@ msgstr "需求单"
#: view:purchase.order:0
#: field:purchase.order,invoice_ids:0
msgid "Invoices"
-msgstr "发票列表"
+msgstr "发票"
#. module: purchase
#: model:process.node,note:purchase.process_node_purchaseorder0
@@ -884,16 +882,15 @@ msgstr "图像"
#. module: purchase
#: view:purchase.report:0
msgid "Total Orders Lines by User per month"
-msgstr "按用户每月的总订单明细"
+msgstr "按用户每月的订单明细汇总"
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,month:0
msgid "Month"
-msgstr "月"
+msgstr "月份"
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr "等该供应商回复"
@@ -901,7 +898,7 @@ msgstr "等该供应商回复"
#. module: purchase
#: report:purchase.quotation:0
msgid "Request for Quotation :"
-msgstr "询价:"
+msgstr "询价单:"
#. module: purchase
#: view:board.board:0
@@ -929,7 +926,7 @@ msgstr "采购的产品"
#: help:purchase.order,picking_ids:0
msgid ""
"This is the list of picking list that have been generated for this purchase"
-msgstr "从采购中已生成装箱单"
+msgstr "这采购已生成装箱单"
#. module: purchase
#: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -941,7 +938,7 @@ msgstr "采购管理"
#: model:process.node,note:purchase.process_node_invoiceafterpacking0
#: model:process.node,note:purchase.process_node_invoicecontrol0
msgid "To be reviewed by the accountant."
-msgstr "等待会计审核。"
+msgstr "等待会计复核。"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -1003,7 +1000,7 @@ msgstr "采购订单明细"
#. module: purchase
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
-msgstr "错误!您不能创建递归的相关业务伙伴。"
+msgstr "错误!您不能创建递归的协会会员。"
#. module: purchase
#: view:purchase.order:0
@@ -1037,7 +1034,7 @@ msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
"the buyer. Depending on the Invoicing control of the purchase order, the "
"invoice is based on received or on ordered quantities."
-msgstr "一旦买方确认根据采购订单的发票控制,一个采购订单生成一个供应商发票,发票根据收到或订购的数量。"
+msgstr "一旦买方确认根据采购订单开发票,一个采购订单生成一个供应商发票,发票根据已收到或已下单的数量。"
#. module: purchase
#: field:purchase.order,amount_untaxed:0
@@ -1068,22 +1065,22 @@ msgstr "Qty. per product"
#. module: purchase
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试分配一个来自其它产品的批次"
+msgstr "您尝试为不同的产品分配批次"
#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
-msgstr "文档的创建日期"
+msgstr "单据的创建日期"
#. module: purchase
#: view:res.partner:0
msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
#. module: purchase
#: selection:purchase.report,month:0
msgid "June"
-msgstr "6"
+msgstr "6月"
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_report
@@ -1096,16 +1093,16 @@ msgid "Manual Invoices"
msgstr "手工发票"
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr "有人刚确认一个超过默认限制金额的采购"
+msgstr "有人刚确认一个超过默认限定金额的采购"
#. module: purchase
#: selection:purchase.report,month:0
msgid "November"
-msgstr "11"
+msgstr "11月"
#. module: purchase
#: view:purchase.report:0
@@ -1113,14 +1110,14 @@ msgid "Extended Filters..."
msgstr "增加筛选条件"
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "未定义此产品“%s“ (id:%d)的费用科目"
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr "您必须先取消掉附加到此采购订单上的所有发票。"
@@ -1144,7 +1141,7 @@ msgstr "异常"
#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
-msgstr "10"
+msgstr "10月"
#. module: purchase
#: view:purchase.order:0
@@ -1175,7 +1172,7 @@ msgstr ""
" "
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1185,7 +1182,7 @@ msgstr "这选定的供应商设定的最少采购数量为 %s,您不能采购
#. module: purchase
#: selection:purchase.report,month:0
msgid "January"
-msgstr "1"
+msgstr "1月"
#. module: purchase
#: model:ir.model,name:purchase.model_res_company
@@ -1205,7 +1202,7 @@ msgstr "必须为此产品赋予一个生产批次"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
msgid "A pick list is generated to track the incoming products."
-msgstr "生成装箱单跟踪入库的产品"
+msgstr "生成装箱单用来跟踪入库的产品"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
@@ -1227,7 +1224,7 @@ msgstr "价格表类型"
#: view:purchase.order:0
#: view:purchase.report:0
msgid "Quotations"
-msgstr "报价单"
+msgstr "询价单"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
@@ -1243,18 +1240,18 @@ msgstr "日志"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
msgid "Products by Category"
-msgstr "分类的产品"
+msgstr "产品分类"
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay:0
msgid "Days to Validate"
-msgstr "审批日期"
+msgstr "审核日期"
#. module: purchase
#: help:purchase.order,origin:0
msgid "Reference of the document that generated this purchase order request."
-msgstr "相关文档生成这采购订单申请"
+msgstr "生成这采购订单申请的相关单据"
#. module: purchase
#: help:purchase.order,state:0
@@ -1267,11 +1264,11 @@ msgid ""
"or in the reception of goods, the state becomes in exception."
msgstr ""
"采购订单或询价单的状态。\r\n"
-" 询价单是采购订单的‘草稿’状态。\r\n"
-" 订单被用户确确认为‘已确认’状态。\r\n"
-" 然后订单的供应商必须确认这时状态改为为‘已核准’。 \r\n"
-" 当采购订单支付和已收货状态变为‘完成’。\r\n"
-" 如果在开发票或接收产品时执行取消操作状态将变为‘异常’。"
+" 询价单是采购订单的‘草稿’状态。\r\n"
+"订单被用户确认为‘已确认’状态。\r\n"
+"然后订单的供应商必须确认这时状态改为为‘已审批’。 \r\n"
+"当采购订单支付和已收货状态变为‘完成’。 \r\n"
+"如果在开发票或接收产品时执行取消操作状态将变为‘异常’。"
#. module: purchase
#: field:purchase.order.line,price_subtotal:0
@@ -1287,7 +1284,7 @@ msgstr "询价单"
#. module: purchase
#: help:purchase.order,date_approve:0
msgid "Date on which purchase order has been approved"
-msgstr "采购订单核准的日期"
+msgstr "采购订单审批日期"
#. module: purchase
#: selection:purchase.order,state:0
@@ -1304,13 +1301,13 @@ msgstr "默认采购价格表版本"
#: view:purchase.installer:0
msgid ""
"Extend your Purchases Management Application with additional functionalities."
-msgstr "扩展您采购管理的应用并增加功能"
+msgstr "扩展您采购管理应用并增加功能"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
#: view:purchase.installer:0
msgid "Purchases Application Configuration"
-msgstr "采购管理应用程序设置"
+msgstr "采购应用设置"
#. module: purchase
#: field:purchase.order,fiscal_position:0
@@ -1331,7 +1328,7 @@ msgstr "发票"
#. module: purchase
#: selection:purchase.report,month:0
msgid "December"
-msgstr "12"
+msgstr "12月"
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1351,7 +1348,7 @@ msgstr "采购订单明细"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
msgid "The supplier approves the Purchase Order."
-msgstr "供应商核准了这采购订单。"
+msgstr "供应商审批了这采购订单。"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1374,7 +1371,7 @@ msgstr "合并采购订单"
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_order_line_invoice
msgid "Purchase Order Line Make Invoice"
-msgstr "采购订单明细产生发票"
+msgstr "采购订单明细生成发票"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1427,7 +1424,7 @@ msgstr "仓库"
#: model:process.node,note:purchase.process_node_draftpurchaseorder0
#: model:process.node,note:purchase.process_node_draftpurchaseorder1
msgid "Request for Quotations."
-msgstr "询价请求"
+msgstr "询价单"
#. module: purchase
#: report:purchase.order:0
@@ -1438,10 +1435,10 @@ msgstr "要求日期"
#: field:purchase.order,date_approve:0
#: field:purchase.report,date_approve:0
msgid "Date Approved"
-msgstr "已核准日期"
+msgstr "审批日期"
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr "无法取消此采购订单!"
@@ -1460,7 +1457,7 @@ msgstr "交付 & 开发票"
#. module: purchase
#: field:purchase.order.line,date_planned:0
msgid "Scheduled Date"
-msgstr "预定日期"
+msgstr "计划日期"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1488,7 +1485,7 @@ msgstr "说明"
#. module: purchase
#: help:res.company,po_lead:0
msgid "This is the leads/security time for each purchase order."
-msgstr "这是每个采购订单的交货周期/备用时间。"
+msgstr "这是每个采购订单的备货/安全保障时间。"
#. module: purchase
#: report:purchase.quotation:0
@@ -1523,7 +1520,7 @@ msgstr "交付"
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
-msgstr "询价请求"
+msgstr "询价单"
#. module: purchase
#: field:purchase.order.line,product_uom:0
@@ -1553,7 +1550,7 @@ msgid "Total Qty and Amount by month"
msgstr "按月度的总数量和总金额"
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr "无法取消采购订单!"
@@ -1563,12 +1560,12 @@ msgstr "无法取消采购订单!"
msgid ""
"In case there is no supplier for this product, the buyer can fill the form "
"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-msgstr "如果这产品没有供应商,买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
+msgstr "在这业务产品没有供应商,买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
#. module: purchase
#: selection:purchase.report,month:0
msgid "February"
-msgstr "2"
+msgstr "2月"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
@@ -1584,7 +1581,7 @@ msgstr "采购分析"
#. module: purchase
#: report:purchase.order:0
msgid "Your Order Reference"
-msgstr "你订单"
+msgstr "您的订单"
#. module: purchase
#: view:purchase.order:0
@@ -1592,7 +1589,7 @@ msgstr "你订单"
#: report:purchase.quotation:0
#: field:purchase.report,expected_date:0
msgid "Expected Date"
-msgstr "预定日期"
+msgstr "预计日期"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
@@ -1624,12 +1621,12 @@ msgstr "采购控制"
#. module: purchase
#: selection:purchase.report,month:0
msgid "March"
-msgstr "3"
+msgstr "3月"
#. module: purchase
#: selection:purchase.report,month:0
msgid "April"
-msgstr "4"
+msgstr "4月"
#. module: purchase
#: view:purchase.order.group:0
@@ -1681,12 +1678,12 @@ msgstr "开票方式"
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
msgid "Approve"
-msgstr "核准"
+msgstr "审批"
#. module: purchase
#: view:purchase.order:0
msgid "To Approve"
-msgstr "待核准"
+msgstr "待审批"
#. module: purchase
#: view:purchase.order.line:0
@@ -1705,12 +1702,12 @@ msgid ""
"* The 'Cancelled' state is set automatically when user cancel purchase order."
msgstr ""
" “草稿”状态当采购订单在草稿状态是自动设置\n"
-"“确认”状态当采购订单在确认状态时自动设置为确认\n"
-"“完成”状态当采购订单完成自动设置\n"
-"“取消”状态当用户取消采购订单时自动设置"
+"“已确认”状态当采购订单在确认状态时自动设置为确认\n"
+"“已完成”状态当采购订单完成自动设置\n"
+"“已取消”状态当用户取消采购订单时自动设置"
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr "采购订单 “%s” 已经取消"
@@ -1760,7 +1757,7 @@ msgstr "总金额"
#. module: purchase
#: selection:purchase.report,month:0
msgid "May"
-msgstr "5"
+msgstr "5月"
#. module: purchase
#: field:res.company,po_lead:0
@@ -1787,7 +1784,7 @@ msgid "Partner"
msgstr "业务伙伴"
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"
@@ -2013,12 +2010,6 @@ msgstr "采购控制台"
#~ msgid "Approving Purchase Order"
#~ msgstr "通过采购订单"
-#~ msgid "To be Invoiced"
-#~ msgstr "待开票"
-
-#~ msgid "Product UoM"
-#~ msgstr "货品计量单位"
-
#~ msgid "From Picking"
#~ msgstr "来自装箱单"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 480ae47ab84..9fe39ecb931 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid ""
"You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
msgstr "注解"
#. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
#, python-format
msgid ""
"You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid "No Partner!"
msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -759,7 +759,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Waiting Supplier Ack"
msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
#, python-format
msgid ""
"Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1674,7 +1673,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
#, python-format
msgid ""
"You have to select a partner in the purchase form !\n"