summaryrefslogtreecommitdiff
path: root/addons/delivery
diff options
context:
space:
mode:
authorLaunchpad Translations on behalf of openerp <>2011-01-06 05:38:49 +0000
committerLaunchpad Translations on behalf of openerp <>2011-01-06 05:38:49 +0000
commit35fa7cd34e38ee340bf8d58e263bd6cda7aee8f6 (patch)
tree7a6c0ca816a8ac9429e3a20f83607a08c62788d2 /addons/delivery
parentfe01a3eba8cd3b26464f04ac28b999a2493b2902 (diff)
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106043500-7v9lu0vz6rw06og9 bzr revid: launchpad_translations_on_behalf_of_openerp-20110106053849-1bfeq2m1gsv0j789
Diffstat (limited to 'addons/delivery')
-rw-r--r--addons/delivery/i18n/ar.po69
-rw-r--r--addons/delivery/i18n/bg.po73
-rw-r--r--addons/delivery/i18n/bs.po69
-rw-r--r--addons/delivery/i18n/ca.po73
-rw-r--r--addons/delivery/i18n/cs.po69
-rw-r--r--addons/delivery/i18n/de.po102
-rw-r--r--addons/delivery/i18n/el.po73
-rw-r--r--addons/delivery/i18n/es.po104
-rw-r--r--addons/delivery/i18n/es_AR.po73
-rw-r--r--addons/delivery/i18n/es_EC.po73
-rw-r--r--addons/delivery/i18n/et.po73
-rw-r--r--addons/delivery/i18n/fi.po73
-rw-r--r--addons/delivery/i18n/fr.po109
-rw-r--r--addons/delivery/i18n/hr.po73
-rw-r--r--addons/delivery/i18n/hu.po69
-rw-r--r--addons/delivery/i18n/id.po69
-rw-r--r--addons/delivery/i18n/it.po73
-rw-r--r--addons/delivery/i18n/ko.po73
-rw-r--r--addons/delivery/i18n/lt.po69
-rw-r--r--addons/delivery/i18n/mn.po73
-rw-r--r--addons/delivery/i18n/nl.po102
-rw-r--r--addons/delivery/i18n/nl_BE.po69
-rw-r--r--addons/delivery/i18n/pl.po73
-rw-r--r--addons/delivery/i18n/pt.po85
-rw-r--r--addons/delivery/i18n/pt_BR.po73
-rw-r--r--addons/delivery/i18n/ro.po69
-rw-r--r--addons/delivery/i18n/ru.po73
-rw-r--r--addons/delivery/i18n/sl.po73
-rw-r--r--addons/delivery/i18n/sq.po69
-rw-r--r--addons/delivery/i18n/sr.po73
-rw-r--r--addons/delivery/i18n/sr@latin.po73
-rw-r--r--addons/delivery/i18n/sv.po73
-rw-r--r--addons/delivery/i18n/tlh.po69
-rw-r--r--addons/delivery/i18n/tr.po73
-rw-r--r--addons/delivery/i18n/uk.po69
-rw-r--r--addons/delivery/i18n/vi.po69
-rw-r--r--addons/delivery/i18n/zh_CN.po115
-rw-r--r--addons/delivery/i18n/zh_TW.po69
38 files changed, 1613 insertions, 1288 deletions
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 3265df0e51e..a54267bb52d 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-02-03 06:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index c3678f7d2f3..d4f34e7500a 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-08-03 03:23+0000\n"
"Last-Translator: lem0na <nickyk@gmx.net>\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: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Обем"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Ред от матрица"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Променлив коефициент"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Фиксирана"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Състояние"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Себестойност"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Продажби и поръчки"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Себестойност"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Цена"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "Идентификатор"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index 21dfffdd3d0..1e5f53f5286 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-02-03 19:47+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr "Prodaja i nabava"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 320c150dddc..edf98f55f0d 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-10-30 09:21+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "No hi ha preu disponible!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Volum"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Línia de la quadrícula"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Factor variable"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fix"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -145,7 +159,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Avís"
@@ -265,7 +287,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -276,7 +298,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "L'ordre no està en estat borrador!"
@@ -318,17 +341,9 @@ msgid "Condition"
msgstr "Condició"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preu cost"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -373,23 +388,14 @@ msgid "Sales & Purchases"
msgstr "Vendes & Compres"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preu cost"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -421,7 +427,7 @@ msgid "Price"
msgstr "Preu"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "No concorda quadrícula per aquest transportista!"
@@ -443,7 +449,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "El transportista %s (id: %d) no disposa de quadrícula d'enviament!"
@@ -474,7 +480,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index a20e6c29cd4..8cb6e8ccc5d 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-02-03 19:47+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 1f0a295c09f..a0c03caafda 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-29 10:28+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr "Lieferauftrag"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Kein Preis verfügbar!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Volumen"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Tarifpositionen"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Variabl. Faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fest"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr "Lagerbuchung"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -145,7 +159,15 @@ msgid "Net Weight"
msgstr "Nettogewicht"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Warnung"
@@ -274,7 +296,7 @@ msgstr ""
"Durch Aktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden."
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Kein Tarif definiert!"
@@ -285,7 +307,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Auftrag nicht im Entwurf Stadium!"
@@ -328,20 +351,9 @@ msgid "Condition"
msgstr "Konditionen"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-"Erstellen und verwalten Sie die Auslieferungsmethoden für Ihren Vertrieb. "
-"Jede Auslieferungsmethode kann auch einer Preisliste zugeordnet werden, um "
-"den Preis gemäß der verkauften oder gelieferten Produkte zu kalkulieren."
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Herstellungskosten"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -390,28 +402,14 @@ msgid "Sales & Purchases"
msgstr "Verkauf & Einkauf"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-"Die Preisliste für Auslieferungen ermöglicht eine Errechnung der Kosten auf "
-"Grundlage des Versandgewichts, der Auslieferungsdistanz u.a. Kriterien. Sie "
-"können unterschiedliche Preislisten für eine Auslieferungsmethode "
-"definieren, z.B. aufgeteilt nach Regionen, Ländern, Liefergebiet, "
-"Postleitzahlenzone etc."
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Herstellungskosten"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
#. module: delivery
#: view:delivery.sale.order:0
@@ -443,7 +441,7 @@ msgid "Price"
msgstr "Preis"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Kein Tarif für diesen Frachtführer definiert!"
@@ -465,7 +463,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Der Frachtführer %s (id: %d) hat kein passendes Tarifmodell!"
@@ -496,7 +494,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
@@ -639,3 +638,24 @@ msgstr "Preistyp"
#~ msgid "Size of the field can never be less than 1 !"
#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid ""
+#~ "The delivery pricelist allows you to compute the cost and sales price of the "
+#~ "delivery based on the weight of the products and other criteria. You can "
+#~ "define several pricelists for one delivery method, for each region such as "
+#~ "countries or a zone in a specific country defined by a zip code range."
+#~ msgstr ""
+#~ "Die Preisliste für Auslieferungen ermöglicht eine Errechnung der Kosten auf "
+#~ "Grundlage des Versandgewichts, der Auslieferungsdistanz u.a. Kriterien. Sie "
+#~ "können unterschiedliche Preislisten für eine Auslieferungsmethode "
+#~ "definieren, z.B. aufgeteilt nach Regionen, Ländern, Liefergebiet, "
+#~ "Postleitzahlenzone etc."
+
+#~ msgid ""
+#~ "Create and manage the delivery method(s) you want your sales to be processed "
+#~ "with. Each delivery method can be assigned to a pricelist which computes the "
+#~ "price of the delivery according to the products sold or delivered."
+#~ msgstr ""
+#~ "Erstellen und verwalten Sie die Auslieferungsmethoden für Ihren Vertrieb. "
+#~ "Jede Auslieferungsmethode kann auch einer Preisliste zugeordnet werden, um "
+#~ "den Preis gemäß der verkauften oder gelieferten Produkte zu kalkulieren."
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 3d28c03ccef..fe33ff40cef 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-08-03 03:24+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Καμία διαθέσιμη τιμή!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Όγκος"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Γραμμή Πίνακα"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Παράγοντας Μεταβλητής"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Σταθερό"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -145,7 +159,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Προειδοποίηση"
@@ -265,7 +287,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -276,7 +298,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Η εντολή δεν βρίσκεται σε πρόχειρη κατάσταση!"
@@ -318,17 +341,9 @@ msgid "Condition"
msgstr "Κατάσταση"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Τιμή Κόστους"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -373,23 +388,14 @@ msgid "Sales & Purchases"
msgstr "Πωλήσεις & Αγορές"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Τιμή Κόστους"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -421,7 +427,7 @@ msgid "Price"
msgstr "Τιμή"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Κανένας πίνακας δεν ταιριάζει με αυτόν τον μεταφορέα!"
@@ -443,7 +449,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Ο μεταφορέας %s (κωδ: %d) δεν έχει πίνακα παραδόσεων!"
@@ -474,7 +480,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 6d9ea99df2e..21d59175e66 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-27 09:23+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr "Orden de entrega"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "¡No existe precio disponible!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Volumen"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Línea de la cuadrícula"
@@ -109,6 +114,15 @@ msgid "Variable Factor"
msgstr "Factor variable"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fijo"
@@ -129,7 +143,7 @@ msgid "Stock Move"
msgstr "Movimiento stock"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -147,7 +161,15 @@ msgid "Net Weight"
msgstr "Peso neto"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -278,7 +300,7 @@ msgstr ""
"eliminarlo."
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "¡No hay una cuadrícula disponible!"
@@ -289,7 +311,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "¡La orden no está en estado borrador!"
@@ -331,21 +354,9 @@ msgid "Condition"
msgstr "Condición"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-"Crear y administrar los métodos de entrega con que quiere procesar sus "
-"ventas. Cada método de entrega puede ser asignado a una lista de precios que "
-"calcula el precio de la entrega de acuerdo a los productos vendidos o "
-"entregados."
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -392,28 +403,14 @@ msgid "Sales & Purchases"
msgstr "Ventas & Compras"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-"La lista de precios de entrega le permite calcular el costo y el precio de "
-"venta de la entrega con base en el peso de los productos y otros criterios. "
-"Usted puede definir varias listas de precios para un método de entrega, para "
-"cada región, como países, o una zona de un país específico definida por un "
-"rango de códigos postales."
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
#. module: delivery
#: view:delivery.sale.order:0
@@ -445,7 +442,7 @@ msgid "Price"
msgstr "Precio"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "¡No concuerda cuadrícula para este transportista!"
@@ -467,7 +464,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -498,7 +495,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -634,3 +632,25 @@ msgstr "Tipo de precio"
#~ msgid "The name of the module must be unique !"
#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid ""
+#~ "The delivery pricelist allows you to compute the cost and sales price of the "
+#~ "delivery based on the weight of the products and other criteria. You can "
+#~ "define several pricelists for one delivery method, for each region such as "
+#~ "countries or a zone in a specific country defined by a zip code range."
+#~ msgstr ""
+#~ "La lista de precios de entrega le permite calcular el costo y el precio de "
+#~ "venta de la entrega con base en el peso de los productos y otros criterios. "
+#~ "Usted puede definir varias listas de precios para un método de entrega, para "
+#~ "cada región, como países, o una zona de un país específico definida por un "
+#~ "rango de códigos postales."
+
+#~ msgid ""
+#~ "Create and manage the delivery method(s) you want your sales to be processed "
+#~ "with. Each delivery method can be assigned to a pricelist which computes the "
+#~ "price of the delivery according to the products sold or delivered."
+#~ msgstr ""
+#~ "Crear y administrar los métodos de entrega con que quiere procesar sus "
+#~ "ventas. Cada método de entrega puede ser asignado a una lista de precios que "
+#~ "calcula el precio de la entrega de acuerdo a los productos vendidos o "
+#~ "entregados."
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 05e3b4c7c24..8440cdd8811 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-09-16 04:48+0000\n"
"Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "¡El precio no está disponible!"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volumen"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Línea de Grillas"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Factor variable"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fijo"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -144,7 +158,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -264,7 +286,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -275,7 +297,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "¡La orden no está en estado borrador!"
@@ -317,17 +340,9 @@ msgid "Condition"
msgstr "Condición"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio de costo"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -372,23 +387,14 @@ msgid "Sales & Purchases"
msgstr "Ventas & Compras"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio de costo"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -420,7 +426,7 @@ msgid "Price"
msgstr "Precio"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "No concuerda la grilla para éste transportista"
@@ -442,7 +448,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -473,7 +479,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index 766882a4427..ad1946a81b8 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-09-17 19:09+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Volumen"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Línea de la cuadrícula"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Factor variable"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fijo"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -316,17 +339,9 @@ msgid "Condition"
msgstr "Condición"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -371,23 +386,14 @@ msgid "Sales & Purchases"
msgstr "Ventas & Compras"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -419,7 +425,7 @@ msgid "Price"
msgstr "Precio"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -441,7 +447,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -472,7 +478,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index cd150701f15..56c2c30623b 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-10-30 13:40+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Hinda pole saadaval !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Ruumala"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Muutuja faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fikseeritud"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Hoiatus"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Seisukord"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Ostuhind"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Müügid ja ostud"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Ostuhind"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Hind"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 87364ac2343..4d20d58786c 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-10-30 11:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Ei hintaa saatavilla!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Tilavuus"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Taulukkorivi"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Vaihteleva kerroin"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Kiinteä"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr "Yksikään valitun toimitustaulukon rivi ei vastaa tilausta!"
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Varoitus"
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Tilaus ei ole luonnostilassa!"
@@ -316,17 +339,9 @@ msgid "Condition"
msgstr "Tila"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kustannushinta"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -371,23 +386,14 @@ msgid "Sales & Purchases"
msgstr "Myynti ja hankinta"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kustannushinta"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -419,7 +425,7 @@ msgid "Price"
msgstr "Hinta"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Kuljetusliikkeen taulukossa ei ole lähetystä vastaavia kohtia!"
@@ -441,7 +447,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Kuljetusliikkeellä %s (tunnus: %d) ei ole taulukkoa kuljetuksille!"
@@ -472,7 +478,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 80d0151f20c..8c525d36696 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -6,14 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2011-01-01 13:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
+"PO-Revision-Date: 2011-01-05 21:12+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#~ msgid "Invalid XML for View Architecture!"
@@ -48,7 +49,7 @@ msgid "Delivery Order"
msgstr "Ordre de livraison"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Aucun prix disponible !"
@@ -71,6 +72,11 @@ msgid "Volume"
msgstr "Volume"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "La référence de la commande doit être unique !"
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Ligne de tarif"
@@ -114,6 +120,15 @@ msgid "Variable Factor"
msgstr "Facteur variable"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fixe"
@@ -134,7 +149,7 @@ msgid "Stock Move"
msgstr "Mouvement de stock"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -151,7 +166,15 @@ msgid "Net Weight"
msgstr "Poids net"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Averstissement"
@@ -283,7 +306,7 @@ msgstr ""
"transporteur de la livraison sans pour autant le supprimer."
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Pas de grille tarifaire disponible !"
@@ -294,7 +317,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "La commande n'est pas à l'état de brouillon"
@@ -337,21 +361,9 @@ msgid "Condition"
msgstr "Condition"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-"Créez et gérer les méthodes de livraisons avec lesquelles vous voulez "
-"traiter vos commandes de vente. Chaque méthode de livraison peut être "
-"associée à une liste de prix qui calcule le prix de la livraison en fonction "
-"des produits vendus ou livrés."
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Vous devez affecter un lot de fabrication à ce produit."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Prix standard"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -400,28 +412,14 @@ msgid "Sales & Purchases"
msgstr "Ventes et achats"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-"La liste de prix de la livraison vous permet de calculer le coût et le prix "
-"de vente de la livraison en fonction des poids des produits et d'autres "
-"critères. Vous pouvez définir plusieurs listes de prix pour une même méthode "
-"de livraison, pour chaque région comme par exemple des pays ou des zones à "
-"l'intérieur d'un pays définies par une plage de codes postaux."
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Prix standard"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Vous devez affecter un lot de fabrication à ce produit."
#. module: delivery
#: view:delivery.sale.order:0
@@ -453,7 +451,7 @@ msgid "Price"
msgstr "Prix"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Aucun tarif correspondant pour ce transporteur !"
@@ -475,7 +473,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Le transporteur %s (id: %d) n'a pas de tarif de livraison !"
@@ -506,7 +504,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
@@ -617,3 +616,25 @@ msgstr "Type de prix"
#~ msgid "Sale Order"
#~ msgstr "Commande de vente"
+
+#~ msgid ""
+#~ "Create and manage the delivery method(s) you want your sales to be processed "
+#~ "with. Each delivery method can be assigned to a pricelist which computes the "
+#~ "price of the delivery according to the products sold or delivered."
+#~ msgstr ""
+#~ "Créez et gérer les méthodes de livraisons avec lesquelles vous voulez "
+#~ "traiter vos commandes de vente. Chaque méthode de livraison peut être "
+#~ "associée à une liste de prix qui calcule le prix de la livraison en fonction "
+#~ "des produits vendus ou livrés."
+
+#~ msgid ""
+#~ "The delivery pricelist allows you to compute the cost and sales price of the "
+#~ "delivery based on the weight of the products and other criteria. You can "
+#~ "define several pricelists for one delivery method, for each region such as "
+#~ "countries or a zone in a specific country defined by a zip code range."
+#~ msgstr ""
+#~ "La liste de prix de la livraison vous permet de calculer le coût et le prix "
+#~ "de vente de la livraison en fonction des poids des produits et d'autres "
+#~ "critères. Vous pouvez définir plusieurs listes de prix pour une même méthode "
+#~ "de livraison, pour chaque région comme par exemple des pays ou des zones à "
+#~ "l'intérieur d'un pays définies par une plage de codes postaux."
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index b8af2a8246b..6bf1c96f684 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-08-03 03:24+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Volumen"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "?Grid line"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Varijabilni Faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fiksno"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -316,17 +339,9 @@ msgid "Condition"
msgstr "Uvjet"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cijena Koštanja"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -371,23 +386,14 @@ msgid "Sales & Purchases"
msgstr "Prodaja i Nabava"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cijena Koštanja"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -419,7 +425,7 @@ msgid "Price"
msgstr "Cijena"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -441,7 +447,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -472,7 +478,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 30fbf59bf42..687ba64dca5 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-02-03 19:47+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 80394840ecf..4f582b1f0c4 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-11-09 13:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index ebc1c568b7d..b69d22d71ac 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-10-30 12:19+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Nessun prezzo disponibile !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volume"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Riga Griglia"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Fattore Variabile"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fisso"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Attenzione"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Condizione"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Prezzo di Costo"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Vendite e Acquisti"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Prezzo di Costo"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Prezzo"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 430998812c2..1eb690cbf3a 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-09-08 15:49+0000\n"
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "가용한 가격이 없음!"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "체적"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "그리드 라인"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "변수 팩터"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "고정됨"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr "선택한 배송 그리드에는 이 주문에 부합하는 라인이 없습니다."
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "경고"
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "주문이 드래프트 상태가 아님!"
@@ -316,17 +339,9 @@ msgid "Condition"
msgstr "조건"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "원가 가격"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -371,23 +386,14 @@ msgid "Sales & Purchases"
msgstr "판매 & 구매"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "원가 가격"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -419,7 +425,7 @@ msgid "Price"
msgstr "가격"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "이 운송자에 부합하는 그리드가 없습니다 !"
@@ -441,7 +447,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "운송자 %s (id: %d) 는 배송 그리드가 없습니다."
@@ -472,7 +478,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr "배송 라인을 추가하려면, 주문 상태가 드래프트여야 합니다."
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index 6f898a4b4c6..66ee6ebac8d 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-09-08 15:22+0000\n"
"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index e2ed5a7b6d2..b4ae3f120c8 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-11-09 08:08+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Үнэгүй боломж !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Эзлэхүүн"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Хүснэгтийн мөр"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Өөрчлөгдөх хүчин зүйл"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Тогтсон"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr "Барааны хөдөлгөөн"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr "Цэвэр жин"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Анхааруулга"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Ноорог захиалга байхгүй !"
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Нөхцөл"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Өртөг үнэ"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Борлуулалт & Худалдан авалт"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Өртөг үнэ"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Үнэ"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 3ec645b465c..3b5bdf3f392 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-01 07:20+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Geen prijs beschikbaar!"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volume"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Planningsregel"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Variabele Factor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Vast"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr "Voorraad Verplaatsing"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -145,7 +159,15 @@ msgid "Net Weight"
msgstr "Netto gewicht"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Waarschuwing"
@@ -272,7 +294,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Geen planning beschikbaar !"
@@ -283,7 +305,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Order niet in status \"Concept\"!"
@@ -325,20 +348,9 @@ msgid "Condition"
msgstr "Voorwaarde"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-"Maakt en beheert de aflever methode(s) waarmee u uw order mee wilt laten "
-"verwerken. Elke aflevermethode kan worden toegewezen aan een prijslijst die "
-"de prijs van de levering berekent voor de verkochte of geleverde producten."
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostprijs"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -386,28 +398,14 @@ msgid "Sales & Purchases"
msgstr "Verkopen & Inkopen"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-"De afleverprijslijst laat u de kost- en verkoopprijs berekenen van de "
-"aflevering gebaseerd op het gewicht van de producten en andere criteria. U "
-"kunt verschillende prijslijsten definiëren voor een aflevermethode, voor "
-"elke regio zoals landen of zones in een specifiek land, gedefinieerd door "
-"een postcode bereik."
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kostprijs"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -439,7 +437,7 @@ msgid "Price"
msgstr "Prijs"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Geen passende leveringsmatrix gevonden voor deze vervoerder!"
@@ -461,7 +459,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!"
@@ -492,7 +490,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
@@ -630,3 +629,24 @@ msgstr "Soort prijs"
#~ msgid "The name of the module must be unique !"
#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid ""
+#~ "The delivery pricelist allows you to compute the cost and sales price of the "
+#~ "delivery based on the weight of the products and other criteria. You can "
+#~ "define several pricelists for one delivery method, for each region such as "
+#~ "countries or a zone in a specific country defined by a zip code range."
+#~ msgstr ""
+#~ "De afleverprijslijst laat u de kost- en verkoopprijs berekenen van de "
+#~ "aflevering gebaseerd op het gewicht van de producten en andere criteria. U "
+#~ "kunt verschillende prijslijsten definiëren voor een aflevermethode, voor "
+#~ "elke regio zoals landen of zones in een specifiek land, gedefinieerd door "
+#~ "een postcode bereik."
+
+#~ msgid ""
+#~ "Create and manage the delivery method(s) you want your sales to be processed "
+#~ "with. Each delivery method can be assigned to a pricelist which computes the "
+#~ "price of the delivery according to the products sold or delivered."
+#~ msgstr ""
+#~ "Maakt en beheert de aflever methode(s) waarmee u uw order mee wilt laten "
+#~ "verwerken. Elke aflevermethode kan worden toegewezen aan een prijslijst die "
+#~ "de prijs van de levering berekent voor de verkochte of geleverde producten."
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 30e2794c39d..492b3b2ad16 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-04-24 15:00+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 3370caf63d2..3b99cdfc3db 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-11-08 08:28+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Nie ma ceny !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Objętość"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Pozycja tabeli opłat za dostawy"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Współczynnik zmienny"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Stała"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr "Przesunięcie zapasu"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -144,7 +158,15 @@ msgid "Net Weight"
msgstr "Waga netto"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -264,7 +286,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Brak siatek !"
@@ -275,7 +297,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Zamówienie nie jest w stanie Projekt !"
@@ -318,17 +341,9 @@ msgid "Condition"
msgstr "Warunek"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena (koszt)"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -374,23 +389,14 @@ msgid "Sales & Purchases"
msgstr "Sprzedaż i zakupy"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena (koszt)"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -422,7 +428,7 @@ msgid "Price"
msgstr "Cena"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Brak tabeli opłat za dostawy dla tego przewoźnika !"
@@ -444,7 +450,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Przewoźnik %s (id: %d) nie ma tabeli opłat za dostawy!"
@@ -475,7 +481,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr "Zamówienie musi być w stanie Projekt, aby dodawać pozycje dostaw"
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 7255c077fd0..6088eb52385 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-14 23:04+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr "Ordem de entrega"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Nenhum preço disponivel !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volume"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Linha da grelha"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Factor variável"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fixo"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -144,7 +158,15 @@ msgid "Net Weight"
msgstr "Peso líquido"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -264,7 +286,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -275,7 +297,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Ordem não se encontra no estado de rascunho !"
@@ -317,20 +340,9 @@ msgid "Condition"
msgstr "Condição"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-"Criar e gerir os métodos de entrega que se pretende aplicar às vendas. Cada "
-"método pode ser associado a uma lista de preços que calcula o preço de "
-"entrega de acordo com os produtos sendo vendidos ou entregues"
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Tem de associar um lote de produção a este artigo"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preço de custo"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -375,23 +387,14 @@ msgid "Sales & Purchases"
msgstr "Vendas & Compras"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preço de custo"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Tem de associar um lote de produção a este artigo"
#. module: delivery
#: view:delivery.sale.order:0
@@ -423,7 +426,7 @@ msgid "Price"
msgstr "Preço"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Nenhuma grelha correspondente para esta transportadora !"
@@ -445,7 +448,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "A transportadora %s (id: %d) não tem grelha de entrega !"
@@ -476,7 +479,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
@@ -604,3 +608,12 @@ msgstr "Tipo de preço"
#~ msgstr ""
#~ "Se o campo 'ativo' estiver selecionado, permitir-lhe-á esconder o "
#~ "transportador sem ter de o remover"
+
+#~ msgid ""
+#~ "Create and manage the delivery method(s) you want your sales to be processed "
+#~ "with. Each delivery method can be assigned to a pricelist which computes the "
+#~ "price of the delivery according to the products sold or delivered."
+#~ msgstr ""
+#~ "Criar e gerir os métodos de entrega que se pretende aplicar às vendas. Cada "
+#~ "método pode ser associado a uma lista de preços que calcula o preço de "
+#~ "entrega de acordo com os produtos sendo vendidos ou entregues"
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 893cbc2298a..280982a0979 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-03 07:23+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Nenhum preço disponível!"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volume"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Linha de Grade"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Fator variável"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fixo"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr "Mov. de Estoque"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr "Peso Líquido"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Condição"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preço de custo"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Vendas & Compras"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preço de custo"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Preço"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index 465f1a7e0c5..800ee597e5b 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-09-08 13:58+0000\n"
"Last-Translator: Dorin Hongu <dhongu@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 0e5a3ea5495..a6cc983a1f8 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-28 09:18+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr "Заказ на доставку"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Нет каталога !"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Объем"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Разделяемая строка"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Переменный фактор"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Фиксированный"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr "Движение ТМЦ"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr "Вес нетто"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Внимание"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Заказ не в состоянии \"Черновик\" !"
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Условие"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Вы должны назначить партию изделий для данной ТМЦ"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Себестоимость"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Продажи и закупки"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Себестоимость"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Цена"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "Идентификатор"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index c4ad5b767cd..780dab95f06 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-10-30 11:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Ni razpoložljive cene!"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Prostornina"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Spremenljivi faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Stalno"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Opozorilo"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Pogoj"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Lastna cena"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Prodaja in nabava"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Lastna cena"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Cena"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "Oznaka"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index 5c567ff81e4..fac392d931e 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-08-02 14:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -316,16 +339,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -371,22 +386,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -419,7 +425,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -441,7 +447,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -472,7 +478,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 1926fdee19a..e21990c2955 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-11-02 07:19+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Cena NIje dostupna !"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Zapremina"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Linija Mreze"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Varijabilni Faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fiksno"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr "Premesti skladiste"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -144,7 +158,15 @@ msgid "Net Weight"
msgstr "Netto Tezina"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Upozorenje"
@@ -270,7 +292,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Nema dostupnih linija"
@@ -281,7 +303,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Zahtev nije u 'U pripremi' !"
@@ -323,17 +346,9 @@ msgid "Condition"
msgstr "Uslov"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena koštanja"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -380,23 +395,14 @@ msgid "Sales & Purchases"
msgstr "Prodaja & Nabavka"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena koštanja"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -428,7 +434,7 @@ msgid "Price"
msgstr "Cena"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Nijedna linija ne odgovara ovom prevozniku"
@@ -450,7 +456,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
@@ -481,7 +487,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index a5bbf0d38fd..65b4b93630e 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-23 16:23+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian latin <sr@latin@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Cena NIje dostupna !"
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr "Zapremina"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Linija Mreze"
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr "Varijabilni Faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fiksno"
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr "Premesti skladiste"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -144,7 +158,15 @@ msgid "Net Weight"
msgstr "Netto Tezina"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Upozorenje"
@@ -270,7 +292,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr "Nema dostupnih linija"
@@ -281,7 +303,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr "Zahtev nije u 'U pripremi' !"
@@ -323,17 +346,9 @@ msgid "Condition"
msgstr "Uslov"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena koštanja"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -380,23 +395,14 @@ msgid "Sales & Purchases"
msgstr "Prodaja & Nabavka"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena koštanja"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -428,7 +434,7 @@ msgid "Price"
msgstr "Cena"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr "Nijedna linija ne odgovara ovom prevozniku"
@@ -450,7 +456,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
@@ -481,7 +487,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 3da647eab91..0cba033dc77 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-11-24 09:11+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr "Pris saknas!"
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Volym"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Matrisrad"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Variabel faktor"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Fast"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr "Lagertransaktion"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr "Nettovikt"
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr "Varning"
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Villkor"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Försäljning och inköp"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kostpris"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Pris"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index 9e733daba02..4b4eb8e85fd 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-02-03 06:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index ac39b1df17f..72fed154937 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-09-09 07:15+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Hacim"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Sabitlendi"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "Koşul"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Maliyeti"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "Alış & Satış Bilgileri"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Maliyeti"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Fiyat"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "No"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 8e4ef6aa742..bdc350d14bc 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-09-08 12:25+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "Об'єм"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Лінія сітки"
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "Змінний фактор"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "Фіксована"
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr "Умова"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr "Збут та постачання"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "Ціна"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index 5600e7df044..f7257d74110 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2010-12-15 15:17+0000\n"
"Last-Translator: Phong Nguyen <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -43,7 +43,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -66,6 +66,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -107,6 +112,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -127,7 +141,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -143,7 +157,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -263,7 +285,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -274,7 +296,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -316,16 +339,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -371,22 +386,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -419,7 +425,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -441,7 +447,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -472,7 +478,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 7575694d1d9..5a88b1f3aa8 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -6,20 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-08-03 03:27+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
+"PO-Revision-Date: 2011-01-02 16:12+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
#: report:sale.shipping:0
msgid "Order Ref."
-msgstr ""
+msgstr "订单参考"
#. module: delivery
#: model:product.template,name:delivery.delivery_product_product_template
@@ -34,18 +34,18 @@ msgstr "目的地"
#. module: delivery
#: field:stock.move,weight_net:0
msgid "Net weight"
-msgstr ""
+msgstr "净重"
#. module: delivery
#: view:stock.picking:0
msgid "Delivery Order"
-msgstr ""
+msgstr "送货单"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
-msgstr ""
+msgstr "无价格表可用!"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid_line
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr "体积"
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "表格行"
@@ -72,7 +77,7 @@ msgstr "表格行"
#. module: delivery
#: model:ir.actions.report.xml,name:delivery.report_shipping
msgid "Delivery order"
-msgstr ""
+msgstr "送货单"
#. module: delivery
#: view:res.partner:0
@@ -82,7 +87,7 @@ msgstr "交货属性"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_picking_tree4
msgid "Picking to be invoiced"
-msgstr ""
+msgstr "要开票的分拣单"
#. module: delivery
#: help:delivery.grid,sequence:0
@@ -98,7 +103,7 @@ msgstr "国家"
#. module: delivery
#: report:sale.shipping:0
msgid "Delivery Order :"
-msgstr ""
+msgstr "送货单:"
#. module: delivery
#: field:delivery.grid.line,variable_factor:0
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr "可变因素"
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr "固定的"
@@ -123,10 +137,10 @@ msgstr "交货方式"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
msgid "Stock Move"
-msgstr ""
+msgstr "库存调拨"
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,10 +156,18 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "警告"
#. module: delivery
#: view:delivery.grid:0
@@ -155,7 +177,7 @@ msgstr "表格定义"
#. module: delivery
#: view:delivery.sale.order:0
msgid "_Cancel"
-msgstr ""
+msgstr "取消(_C)"
#. module: delivery
#: field:delivery.grid.line,operator:0
@@ -165,12 +187,12 @@ msgstr "运算符"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid
@@ -180,7 +202,7 @@ msgstr "交货表格"
#. module: delivery
#: report:sale.shipping:0
msgid "Invoiced to"
-msgstr ""
+msgstr "开票到"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking
@@ -228,7 +250,7 @@ msgstr "到达邮编"
#. module: delivery
#: report:sale.shipping:0
msgid "Order Date"
-msgstr ""
+msgstr "订单日期"
#. module: delivery
#: field:delivery.grid,name:0
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,10 +295,11 @@ msgid ">="
msgstr ">="
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
-msgstr ""
+msgstr "订单不在草稿状态!"
#. module: delivery
#: constraint:res.partner:0
@@ -286,7 +309,7 @@ msgstr "错误!您不能创建递归的相关成员。"
#. module: delivery
#: report:sale.shipping:0
msgid "Lot"
-msgstr ""
+msgstr "批次"
#. module: delivery
#: constraint:stock.move:0
@@ -302,7 +325,7 @@ msgstr "有效"
#. module: delivery
#: report:sale.shipping:0
msgid "Shipping Date"
-msgstr ""
+msgstr "送货日期"
#. module: delivery
#: field:delivery.carrier,product_id:0
@@ -315,17 +338,9 @@ msgid "Condition"
msgstr "条件"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "成本价"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -346,7 +361,7 @@ msgstr "最大值"
#. module: delivery
#: report:sale.shipping:0
msgid "Quantity"
-msgstr ""
+msgstr "数量"
#. module: delivery
#: field:delivery.grid,zip_from:0
@@ -370,23 +385,14 @@ msgid "Sales & Purchases"
msgstr "销售&采购"
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "成本价"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
#. module: delivery
#: view:delivery.sale.order:0
@@ -402,7 +408,7 @@ msgstr "交货成本"
#. module: delivery
#: report:sale.shipping:0
msgid "Description"
-msgstr ""
+msgstr "说明"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -418,7 +424,7 @@ msgid "Price"
msgstr "价格"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr "="
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr "ID"
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index 02ba335dc78..b674f8c8323 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
"PO-Revision-Date: 2009-01-30 13:27+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -42,7 +42,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -65,6 +65,11 @@ msgid "Volume"
msgstr ""
#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr ""
@@ -106,6 +111,15 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
msgstr ""
@@ -126,7 +140,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -142,7 +156,15 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -262,7 +284,7 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -273,7 +295,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -315,16 +338,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"Create and manage the delivery method(s) you want your sales to be processed "
-"with. Each delivery method can be assigned to a pricelist which computes the "
-"price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -370,22 +385,13 @@ msgid "Sales & Purchases"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"The delivery pricelist allows you to compute the cost and sales price of the "
-"delivery based on the weight of the products and other criteria. You can "
-"define several pricelists for one delivery method, for each region such as "
-"countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
-#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr ""
#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -418,7 +424,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -440,7 +446,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -471,7 +477,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""