diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/purchase | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/purchase')
58 files changed, 3101 insertions, 3337 deletions
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 1fb49198404..975754dd5fe 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Purchase Management', 'version': '1.1', 'category': 'Purchases', + 'complexity': "easy", 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. ========================================================================================= diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po index 1d5d6ee293f..8561ee6bf6b 100644 --- a/addons/purchase/i18n/ar.po +++ b/addons/purchase/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -220,7 +220,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -267,7 +267,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -341,7 +341,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -395,7 +395,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -417,7 +417,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -434,8 +434,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -572,7 +572,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -681,7 +681,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -759,7 +759,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -770,7 +770,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -884,7 +884,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -937,7 +936,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1081,7 +1086,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1098,14 +1103,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1152,7 +1157,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1412,7 +1417,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1524,7 +1529,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1668,7 +1673,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1745,7 +1750,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po index 762dfef45fd..cac8adf584d 100644 --- a/addons/purchase/i18n/bg.po +++ b/addons/purchase/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "става потвърена Поръчка." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Назначение" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -79,7 +79,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -121,7 +121,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -144,7 +144,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Няма ценова листа !" @@ -237,7 +237,7 @@ msgid "Partial Picking" msgstr "Частично товарене" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Поръчката '%s' е потвърдена." @@ -284,7 +284,7 @@ msgid "Notes" msgstr "Бележки" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -361,7 +361,7 @@ msgid "Cancelled" msgstr "Отказани" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Поръчката е над лимита" @@ -415,7 +415,7 @@ msgid "Reference" msgstr "Препратка" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Не могат да се трият Поръчка/и в състояние %s!" @@ -437,7 +437,7 @@ msgid "Day" msgstr "Ден" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -454,8 +454,8 @@ msgid "# of Lines" msgstr "# от редове" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Грешни мерни единици" @@ -592,7 +592,7 @@ msgid "Order Lines" msgstr "Редове от поръчка" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Няма партньор" @@ -641,9 +641,9 @@ msgid "Invoices generated for a purchase order" msgstr "Фактури генерирани за поръчка" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -701,7 +701,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Невалидно действие !" @@ -779,7 +779,7 @@ msgid " Month-1 " msgstr " Месец-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -790,7 +790,7 @@ msgid "Manual" msgstr "Ръчно" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -904,7 +904,6 @@ msgid "Month" msgstr "Месец" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Чака потвърждение от доставчик" @@ -957,8 +956,14 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Редове от поръчката, които не са фактурирани" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1101,7 +1106,7 @@ msgid "Manual Invoices" msgstr "Ръчно издадени фактури" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1118,14 +1123,14 @@ msgid "Extended Filters..." msgstr "Разширени филтри" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "Трябва първо да откажете всички фактури прикрепени към тази поръчка" @@ -1172,7 +1177,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1434,7 +1439,7 @@ msgid "Date Approved" msgstr "Одобрен на дата" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1546,7 +1551,7 @@ msgid "Total Qty and Amount by month" msgstr "Общо количество и сума на месец" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1690,7 +1695,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Поръчка '%s' е отказана." @@ -1767,7 +1772,7 @@ msgid "Partner" msgstr "Партньор" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1836,3 +1841,6 @@ msgstr "" #~ msgid "Purchase Orders in Progress" #~ msgstr "Активни заявки за покупка" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Редове от поръчката, които не са фактурирани" diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po index 172fb7fd779..674fcd43ed0 100644 --- a/addons/purchase/i18n/bs.po +++ b/addons/purchase/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "Odredište" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,8 +69,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Iz zaprimanja" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -226,7 +226,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -273,7 +273,7 @@ msgid "Notes" msgstr "Napomene" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -347,7 +347,7 @@ msgid "Cancelled" msgstr "Otkazano" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -401,7 +401,7 @@ msgid "Reference" msgstr "Referenca" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -423,7 +423,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -440,8 +440,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -478,7 +478,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -578,7 +578,7 @@ msgid "Order Lines" msgstr "Redovi naloga" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -627,9 +627,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -687,7 +687,7 @@ msgid "Reservation Destination" msgstr "Odredište rezervacije" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -765,7 +765,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -776,7 +776,7 @@ msgid "Manual" msgstr "Ručno" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -892,7 +892,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -945,7 +944,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1089,7 +1094,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1106,14 +1111,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1160,7 +1165,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1427,7 +1432,7 @@ msgid "Date Approved" msgstr "Datum odobrenja" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1539,7 +1544,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1683,7 +1688,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1760,7 +1765,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1824,6 +1829,9 @@ msgstr "" #~ msgid "Invalid model name in the action definition." #~ msgstr "Neispravan naziv modela u definiciji zadatka." +#~ msgid "From Picking" +#~ msgstr "Iz zaprimanja" + #~ msgid "Purchase Process" #~ msgstr "Proces nabavke" diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po index cd974b250fd..2a5c736de7b 100644 --- a/addons/purchase/i18n/ca.po +++ b/addons/purchase/i18n/ca.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-16 04:54+0000\n" -"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-" -"tic.com>\n" +"PO-Revision-Date: 2011-08-17 21:54+0000\n" +"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -28,7 +27,7 @@ msgstr "" "compra confirmada." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -47,7 +46,7 @@ msgid "Destination" msgstr "Destí" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -85,8 +84,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Des de albarà" +msgid "From Reception" +msgstr "A la recepció" #. module: purchase #: view:purchase.order:0 @@ -130,7 +129,7 @@ msgstr "" "obtenir els productes rebuts, i controlar les factures dels proveïdors." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "El proveïdor seleccionat només ven aquest producte per %s" @@ -153,7 +152,7 @@ msgid "From a Pick list" msgstr "Des d'un albarà" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "No tarifa!" @@ -246,7 +245,7 @@ msgid "Partial Picking" msgstr "Empaquetat parcial" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Comanda de compra '%s' esta confirmada." @@ -293,7 +292,7 @@ msgid "Notes" msgstr "Notes" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -371,7 +370,7 @@ msgid "Cancelled" msgstr "Cancel·lada" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Import de la compra per sobre del límit" @@ -425,7 +424,7 @@ msgid "Reference" msgstr "Referència" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "No es poden eliminar comanda(es) de compra que estiguin en estat %s!" @@ -447,7 +446,7 @@ msgid "Day" msgstr "Dia" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Comanda de compra '%s' s'ha canviat a l'estat esborrany." @@ -464,8 +463,8 @@ msgid "# of Lines" msgstr "# de línies" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -502,7 +501,7 @@ msgid "It indicates that a picking has been done" msgstr "Indica que un albarà ha estat realitzat." #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UdM del producte errònia!" @@ -607,7 +606,7 @@ msgid "Order Lines" msgstr "Línies de la comanda" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Falta empresa!" @@ -663,9 +662,9 @@ msgid "Invoices generated for a purchase order" msgstr "Factures generades per a una comanda de compra" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -730,7 +729,7 @@ msgid "Reservation Destination" msgstr "Destinació de la reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Acció no vàlida!" @@ -814,7 +813,7 @@ msgid " Month-1 " msgstr " Mes-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "No s'ha definit un diari per a aquesta empresa: \"%s\" (id:%d)" @@ -825,7 +824,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -948,7 +947,6 @@ msgid "Month" msgstr "Mes" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Esperant acceptació proveïdor" @@ -1001,8 +999,14 @@ msgstr "Per ser revisat pel comptable." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Línies de compra no facturades" +msgid "On Purchase Order Line" +msgstr "En la línia d'ordres de compra" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "En recepcions" #. module: purchase #: report:purchase.order:0 @@ -1148,7 +1152,7 @@ msgid "Manual Invoices" msgstr "Factures manuals" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1166,7 +1170,7 @@ msgid "Extended Filters..." msgstr "Filtres extesos..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1174,7 +1178,7 @@ msgstr "" "No hi ha compte de despeses definida per a aquest producte: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1233,7 +1237,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1506,7 +1510,7 @@ msgid "Date Approved" msgstr "Data aprovació" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "No es pot cancel·lar aquesta comanda de compra!" @@ -1622,7 +1626,7 @@ msgid "Total Qty and Amount by month" msgstr "Qtat total i import per mes" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "No es pot cancel·lar la comanda de compra!" @@ -1789,7 +1793,7 @@ msgstr "" "una comanda de compra." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "La comanda de compra '%s' està cancel·lada." @@ -1869,7 +1873,7 @@ msgid "Partner" msgstr "Empresa" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1919,9 +1923,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Taulell de compres" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "No podeu tenir 2 versions de tarifes que es superposin!" - #, python-format #~ msgid "" #~ "You have to select a pricelist in the purchase form !\n" @@ -1939,14 +1940,8 @@ msgstr "Taulell de compres" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Factura de proveïdor pre-generada en la recepció per a control" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Si us plau observeu que les comandes només es fusionaran si pertanyen a la " -#~ "mateixa empresa i es dirigeixen a la mateixa ubicació, i les línies només es " -#~ "fusionaran si són exactament les mateixes excepte la quantitat i unitat." +#~ msgid "From Picking" +#~ msgstr "Des de albarà" #~ msgid "Packing" #~ msgstr "Paquet/Albarà" @@ -1963,9 +1958,6 @@ msgstr "Taulell de compres" #~ msgid "Purchase Orders in Progress" #~ msgstr "Comandes de compra en procés" -#~ msgid "N°" -#~ msgstr "Nº" - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Comanda de compra és confirmada per l'usuari." @@ -2145,3 +2137,6 @@ msgstr "Taulell de compres" #~ msgid "Date" #~ msgstr "Data" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Línies de compra no facturades" diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po index 611d0e3a7b3..a111766f937 100644 --- a/addons/purchase/i18n/cs.po +++ b/addons/purchase/i18n/cs.po @@ -1,20 +1,21 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * purchase +# * purchase # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" +"Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2009-02-03 10:09+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2011-07-15 02:37+0000\n" +"Last-Translator: Jiří Hajda <robie@centrum.cz>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" +"X-Poedit-Language: Czech\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -22,37 +23,40 @@ msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." msgstr "" +"Kupec musí schválit RFQ před tím, než bude zaslat dodavateli. RFQ se stance " +"potvrzenou nákupní objednávkou." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "" +msgstr "Nemůžete potvrdit nákupní objednávku bez řádků Nákupní objednávky." #. module: purchase #: field:purchase.order,invoiced:0 msgid "Invoiced & Paid" -msgstr "" +msgstr "Fakturováno & Zaplaceno" #. module: purchase #: field:purchase.order,location_id:0 #: view:purchase.report:0 #: field:purchase.report,location_id:0 msgid "Destination" -msgstr "" +msgstr "Cíl" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" msgstr "" +"Musíte vybrat MJ výrobku ze stejné kategorie jako nákupní MJ výrobku." #. module: purchase #: help:purchase.report,date:0 msgid "Date on which this document has been created" -msgstr "" +msgstr "Datum, kdy byl dokument vytvořen" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -69,24 +73,24 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Nefakturováno" #. module: purchase #: field:purchase.order,dest_address_id:0 msgid "Destination Address" -msgstr "" +msgstr "Cílová adresa" #. module: purchase #: report:purchase.order:0 #: field:purchase.report,validator:0 msgid "Validated By" -msgstr "" +msgstr "Zkontrolováno" #. module: purchase #: view:purchase.order:0 @@ -95,12 +99,12 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,partner_id:0 msgid "Supplier" -msgstr "" +msgstr "Dodavatel" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Do you want to generate the supplier invoices ?" -msgstr "" +msgstr "Chcete generovat faktury dodavatele ?" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action @@ -109,47 +113,50 @@ msgid "" "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." msgstr "" +"Použijte tuto nabídku k hledání ve vašich nákupních objednávkách podle " +"odkazu, dodavatele, výrobků, aj. Pro každou nákupní objednávku můžete " +"sledovat obdržené výrobky a ovládat faktury dodavatelů." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s" #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:156 #, python-format msgid "Supplier Invoices" -msgstr "" +msgstr "Faktury dodavatele" #. module: purchase #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique !" -msgstr "" +msgstr "Odkaz objednávky musí být jedinečný !" #. module: purchase #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "" +msgstr "Ze seznamu navádění" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" -msgstr "" +msgstr "Žádný ceník !" #. module: purchase #: field:purchase.order.line,product_qty:0 #: view:purchase.report:0 #: field:purchase.report,quantity:0 msgid "Quantity" -msgstr "" +msgstr "Množství" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Select an Open Sale Order" -msgstr "" +msgstr "VYberte otevřenou prodejní objednávku" #. module: purchase #: field:purchase.order,company_id:0 @@ -157,35 +164,35 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,company_id:0 msgid "Company" -msgstr "" +msgstr "Společnost" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph #: view:purchase.report:0 msgid "Monthly Purchase by Category" -msgstr "" +msgstr "Měsíční nákupy podle kategorie" #. module: purchase #: view:purchase.order:0 msgid "Set to Draft" -msgstr "" +msgstr "Nastavit na koncept" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "Výjimka faktury" #. module: purchase #: model:product.pricelist,name:purchase.list0 msgid "Default Purchase Pricelist" -msgstr "" +msgstr "Výchozí nákupní ceník" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_current_purchases msgid "Current purchases" -msgstr "" +msgstr "Aktuální nákupy" #. module: purchase #: help:purchase.order,dest_address_id:0 @@ -194,6 +201,8 @@ msgid "" "customer.In this case, it will remove the warehouse link and set the " "customer location." msgstr "" +"Vložte adresu, pokud chcete doručit přímo od dodavatel k zákazníkovi. V " +"tomto případě bude odstraněn odkaz na sklad a nastaveno umístění zákazníka." #. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 @@ -201,11 +210,12 @@ msgid "" "This pricelist will be used, instead of the default one, for purchases from " "the current partner" msgstr "" +"Pro nákup od aktuálního partnera bude použit tento ceník namísto výchozího" #. module: purchase #: report:purchase.order:0 msgid "Fax :" -msgstr "" +msgstr "Fax :" #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -213,22 +223,24 @@ msgid "" "The pricelist sets the currency used for this purchase order. It also " "computes the supplier price for the selected products/quantities." msgstr "" +"Ceník nastavuje měnu použitou pro nákupní objednáku. Také spočítá ceny " +"dodavatele pro vybrané výrobky/množství." #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "Částečné navádění" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." -msgstr "" +msgstr "Nákupní objednávka '%s' je potvrzena." #. module: purchase #: view:purchase.order:0 msgid "Approve Purchase" -msgstr "" +msgstr "Schválit nákup" #. module: purchase #: model:process.node,name:purchase.process_node_approvepurchaseorder0 @@ -236,27 +248,27 @@ msgstr "" #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Approved" -msgstr "" +msgstr "Scháleno" #. module: purchase #: view:purchase.report:0 msgid "Reference UOM" -msgstr "" +msgstr "Referenční MJ" #. module: purchase #: view:purchase.order:0 msgid "Origin" -msgstr "" +msgstr "Původ" #. module: purchase #: field:purchase.report,product_uom:0 msgid "Reference UoM" -msgstr "" +msgstr "Referenční MJ" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree msgid "Purchases" -msgstr "" +msgstr "Nákupy" #. module: purchase #: view:purchase.order:0 @@ -264,20 +276,22 @@ msgstr "" #: view:purchase.order.line:0 #: field:purchase.order.line,notes:0 msgid "Notes" -msgstr "" +msgstr "Poznámky" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" "Please set one before choosing a product." msgstr "" +"V nákupním formuláři musíte vybrat ceník nebo dodavatele !\n" +"Před výběrem výrobku prosíme nastavte jednoho." #. module: purchase #: selection:purchase.report,month:0 msgid "September" -msgstr "" +msgstr "Září" #. module: purchase #: report:purchase.order:0 @@ -285,7 +299,7 @@ msgstr "" #: view:purchase.order.line:0 #: field:purchase.order.line,taxes_id:0 msgid "Taxes" -msgstr "" +msgstr "Daně" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_order @@ -296,35 +310,35 @@ msgstr "" #: model:res.request.link,name:purchase.req_link_purchase_order #: field:stock.picking,purchase_id:0 msgid "Purchase Order" -msgstr "" +msgstr "Nákupní příkaz" #. module: purchase #: field:purchase.order,name:0 #: view:purchase.order.line:0 #: field:purchase.order.line,order_id:0 msgid "Order Reference" -msgstr "" +msgstr "Odkaz objednávky" #. module: purchase #: report:purchase.order:0 msgid "Net Total :" -msgstr "" +msgstr "Čistého celkem:" #. module: purchase #: view:purchase.installer:0 msgid "Configure Your Purchases Management Application" -msgstr "" +msgstr "Nastavit vaši aplikaci Řízení nákupu" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form msgid "Products" -msgstr "" +msgstr "Výrobky" #. module: purchase #: field:purchase.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Průběh nastavení" #. module: purchase #: model:process.transition,note:purchase.process_transition_packinginvoice0 @@ -338,188 +352,188 @@ msgstr "" #: selection:purchase.order.line,state:0 #: selection:purchase.report,state:0 msgid "Cancelled" -msgstr "" +msgstr "Zrušeno" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" -msgstr "" +msgstr "Částka nákupu je nad limitem" #. module: purchase #: view:purchase.order:0 msgid "Convert to Purchase Order" -msgstr "" +msgstr "Převést na nákupní příkaz" #. module: purchase #: field:purchase.order,pricelist_id:0 #: field:purchase.report,pricelist_id:0 msgid "Pricelist" -msgstr "" +msgstr "Ceník" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Shipping Exception" -msgstr "" +msgstr "Výjimka přepravy" #. module: purchase #: field:purchase.order.line,invoice_lines:0 msgid "Invoice Lines" -msgstr "" +msgstr "Řádky faktury" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0 #: model:process.node,name:purchase.process_node_productrecept0 msgid "Incoming Products" -msgstr "" +msgstr "Příchozí výrobky" #. module: purchase #: model:process.node,name:purchase.process_node_packinginvoice0 msgid "Outgoing Products" -msgstr "" +msgstr "Odchozí výrobky" #. module: purchase #: view:purchase.order:0 msgid "Manually Corrected" -msgstr "" +msgstr "Ručně opraveno" #. module: purchase #: view:purchase.report:0 msgid " Month " -msgstr "" +msgstr " Měsíc " #. module: purchase #: view:purchase.order:0 msgid "Reference" -msgstr "" +msgstr "Odkaz" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" -msgstr "" +msgstr "Nelze smazat Nákupní objednávku(y), která je ve stavu %s!" #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "" +msgstr "Kontaktní jméno cílové adresy" #. module: purchase #: model:ir.model,name:purchase.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Přesun zásob" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,day:0 msgid "Day" -msgstr "" +msgstr "Den" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." -msgstr "" +msgstr "Nákupní objednávka '%s' byla nasatavena do návrhového stavu." #. module: purchase #: field:purchase.order.line,account_analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Analytický účet" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,nbr:0 msgid "# of Lines" -msgstr "" +msgstr "# z řádek" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" -msgstr "" +msgstr "Varování" #. module: purchase #: field:purchase.installer,purchase_analytic_plans:0 msgid "Purchase Analytic Plans" -msgstr "" +msgstr "Analytické plány nákupů" #. module: purchase #: model:ir.model,name:purchase.model_purchase_installer msgid "purchase.installer" -msgstr "" +msgstr "purchase.installer" #. module: purchase #: selection:purchase.order.line,state:0 msgid "Draft" -msgstr "" +msgstr "Koncept" #. module: purchase #: report:purchase.order:0 msgid "Net Price" -msgstr "" +msgstr "Čista cena" #. module: purchase #: view:purchase.order.line:0 msgid "Order Line" -msgstr "" +msgstr "Řádek objednávky" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "Indikuje, že navádění bylo dokončeno" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" -msgstr "" +msgstr "Nesprávná MJ výrobku !" #. module: purchase #: model:process.node,name:purchase.process_node_confirmpurchaseorder0 #: selection:purchase.order.line,state:0 msgid "Confirmed" -msgstr "" +msgstr "Potvrzeno" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Průměrná cena" #. module: purchase #: report:purchase.order:0 msgid "Total :" -msgstr "" +msgstr "Celkem :" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 #: view:purchase.order.line_invoice:0 msgid "Confirm" -msgstr "" +msgstr "Potvrdit" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice #: view:purchase.order:0 msgid "Invoice Control" -msgstr "" +msgstr "Řízení faktury" #. module: purchase #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti." #. module: purchase #: field:purchase.order,partner_ref:0 msgid "Supplier Reference" -msgstr "" +msgstr "Odkaz dodavatele" #. module: purchase #: help:purchase.order,amount_tax:0 msgid "The tax amount" -msgstr "" +msgstr "Částka daně" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -536,7 +550,7 @@ msgstr "" #: field:purchase.order.line,state:0 #: view:purchase.report:0 msgid "State" -msgstr "" +msgstr "Stav" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po @@ -544,65 +558,67 @@ msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." msgstr "" +"Přijímací analýza vám umožní jednoduše zkontrolovat a vyhodnotit příjmání " +"obejdnávek vaší společnost a výkonnost doručování vašich dodavatelů." #. module: purchase #: report:purchase.quotation:0 msgid "Tel.:" -msgstr "" +msgstr "Tel.:" #. module: purchase #: model:ir.model,name:purchase.model_stock_picking #: field:purchase.order,picking_ids:0 msgid "Picking List" -msgstr "" +msgstr "Naváděcí seznam" #. module: purchase #: view:purchase.order:0 msgid "Print" -msgstr "" +msgstr "Tisk" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group msgid "Merge Purchase orders" -msgstr "" +msgstr "Sloučit nákupní objednávky" #. module: purchase #: field:purchase.order,order_line:0 msgid "Order Lines" -msgstr "" +msgstr "Řádky objednávky" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" -msgstr "" +msgstr "Žádný partner!" #. module: purchase #: report:purchase.quotation:0 msgid "Fax:" -msgstr "" +msgstr "Fax:" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Celková cena" #. module: purchase #: view:purchase.order:0 msgid "Untaxed amount" -msgstr "" +msgstr "Nezdaněná částka" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist msgid "Pricelists" -msgstr "" +msgstr "Ceníky" #. module: purchase #: field:purchase.report,partner_address_id:0 msgid "Address Contact Name" -msgstr "" +msgstr "Jméno kontaktu adresy" #. module: purchase #: help:purchase.order,invoice_method:0 @@ -618,31 +634,31 @@ msgstr "" #. module: purchase #: help:purchase.order,invoice_ids:0 msgid "Invoices generated for a purchase order" -msgstr "" +msgstr "Faktury generované pro nákupní objednávku" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" -msgstr "" +msgstr "Chyba !" #. module: purchase #: view:purchase.order.line:0 msgid "General Information" -msgstr "" +msgstr "Obecné informace" #. module: purchase #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Moje tabule" #. module: purchase #: report:purchase.order:0 msgid "Purchase Order Confirmation N°" -msgstr "" +msgstr "Potvrzení nákupní objednávky N°" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all @@ -651,11 +667,14 @@ msgid "" "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your suppliers, etc." msgstr "" +"Nákupní analýza vám umožní jednoduše zkontrolovat a analýzovat vaši historii " +"nákupů a výkonnost společnosti. Z této nabídky můžete sledovat vaši " +"vyjednanou výkonnost, výkonnost doručování vašich dodavatelů, aj." #. module: purchase #: view:purchase.order:0 msgid "Approved by Supplier" -msgstr "" +msgstr "Schváleno dodavatelem" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0 @@ -668,63 +687,63 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "From Order" -msgstr "" +msgstr "Z příkazu" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0 msgid "Create invoice" -msgstr "" +msgstr "Vytvořit fakturu" #. module: purchase #: field:purchase.order.line,move_dest_id:0 msgid "Reservation Destination" -msgstr "" +msgstr "Cíl rezervace" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "Neplatná akce !" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.order.line,state:0 #: selection:purchase.report,state:0 msgid "Done" -msgstr "" +msgstr "Dokončeno" #. module: purchase #: selection:purchase.report,month:0 msgid "July" -msgstr "" +msgstr "Červenec" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase #: view:res.company:0 msgid "Configuration" -msgstr "" +msgstr "Nastavení" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier #: view:purchase.report:0 msgid "Purchase by supplier" -msgstr "" +msgstr "Nakoupeno dodavatelem" #. module: purchase #: view:purchase.order:0 msgid "Total amount" -msgstr "" +msgstr "Celková částka" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking msgid "Receptions" -msgstr "" +msgstr "Příjem zboží" #. module: purchase #: field:purchase.order,validator:0 #: view:purchase.report:0 msgid "Validated by" -msgstr "" +msgstr "Ověřeno" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_invoice_pending @@ -739,12 +758,12 @@ msgstr "" #: model:process.node,name:purchase.process_node_draftpurchaseorder0 #: model:process.node,name:purchase.process_node_draftpurchaseorder1 msgid "RFQ" -msgstr "" +msgstr "RFQ" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice msgid "Supplier Invoices to Receive" -msgstr "" +msgstr "Faktury dodavatele k obdržení" #. module: purchase #: help:purchase.installer,purchase_requisition:0 @@ -752,50 +771,53 @@ msgid "" "Manages your Purchase Requisition and allows you to easily keep track and " "manage all your purchase orders." msgstr "" +"Spravuje vaše nákupní požadavky a umožňuje vám jednoduše sledovat a " +"spravovat všechny vaše nákupní objednávky." #. module: purchase #: view:purchase.report:0 msgid " Month-1 " -msgstr "" +msgstr " Měsíc-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" -msgstr "" +msgstr "Pro tuto společnost není určen nákupní deník: \"%s\" (id:%d)" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "Manual" -msgstr "" +msgstr "Ruční" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" +"Musíte nejdříve zrušit všechna navádění připojená k této nákupní objednávce." #. module: purchase #: view:purchase.order:0 #: field:purchase.order.line,date_order:0 #: field:purchase.report,date:0 msgid "Order Date" -msgstr "" +msgstr "Datum objednání" #. module: purchase #: model:process.node,note:purchase.process_node_productrecept0 msgid "Incoming products to control" -msgstr "" +msgstr "Příchozí výrobky k ovládání" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 msgid "Approbation" -msgstr "" +msgstr "Odsouhlasení" #. module: purchase #: view:purchase.report:0 msgid "Purchase Orders Statistics" -msgstr "" +msgstr "Statistiky nákupních objednávek" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2 @@ -810,12 +832,12 @@ msgstr "" #: model:process.node,name:purchase.process_node_invoiceafterpacking0 #: model:process.node,name:purchase.process_node_invoicecontrol0 msgid "Draft Invoice" -msgstr "" +msgstr "Návrh faktury" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 msgid "Manages analytic distribution and purchase orders." -msgstr "" +msgstr "Spravuje analytické rozdělování a nákupní objednávky." #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -823,198 +845,206 @@ msgid "" "This is computed as the minimum scheduled date of all purchase order lines' " "products." msgstr "" +"Toto je spočítáno jako minimální plánovaný datum všechn řádek výrobků " +"prodejní objednávky." #. module: purchase #: selection:purchase.report,month:0 msgid "August" -msgstr "" +msgstr "Srpen" #. module: purchase #: field:purchase.installer,purchase_requisition:0 msgid "Purchase Requisition" -msgstr "" +msgstr "Vyžádání nákupu" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "Kategorie měrných jednotek" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "Dnů do doručení" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory msgid "Receive Products" -msgstr "" +msgstr "Obdržet výrobky" #. module: purchase #: model:ir.model,name:purchase.model_procurement_order msgid "Procurement" -msgstr "" +msgstr "Zásobování" #. module: purchase #: view:purchase.order:0 #: field:purchase.order,invoice_ids:0 msgid "Invoices" -msgstr "" +msgstr "Faktury" #. module: purchase #: model:process.node,note:purchase.process_node_purchaseorder0 msgid "Confirmed purchase order to invoice" -msgstr "" +msgstr "Potvrzená nákupní objednávka k fakturaci" #. module: purchase #: field:purchase.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Obrázek" #. module: purchase #: view:purchase.report:0 msgid "Total Orders Lines by User per month" -msgstr "" +msgstr "Celkem řádek objednávek na uživatele podle měsíce" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,month:0 msgid "Month" -msgstr "" +msgstr "Měsíc" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" -msgstr "" +msgstr "Čekání na potvrzení dodavatelem" #. module: purchase #: report:purchase.quotation:0 msgid "Request for Quotation :" -msgstr "" +msgstr "Požadavek na cenovou nabídku :" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_waiting msgid "Purchase Order Waiting Approval" -msgstr "" +msgstr "Nákupní objednávka čeká na schválení" #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" -msgstr "" +msgstr "Celková částka bez daně" #. module: purchase #: field:purchase.order,shipped:0 #: field:purchase.order,shipped_rate:0 msgid "Received" -msgstr "" +msgstr "Obdrženo" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "Seznam objednaných výrobků." #. module: purchase #: help:purchase.order,picking_ids:0 msgid "" "This is the list of picking list that have been generated for this purchase" msgstr "" +"Toto je seznam naváděcích seznamů, které byly generovány pro tuto objednávku" #. module: purchase #: model:ir.module.module,shortdesc:purchase.module_meta_information #: model:ir.ui.menu,name:purchase.menu_procurement_management msgid "Purchase Management" -msgstr "" +msgstr "Řízení nákupu" #. module: purchase #: model:process.node,note:purchase.process_node_invoiceafterpacking0 #: model:process.node,note:purchase.process_node_invoicecontrol0 msgid "To be reviewed by the accountant." -msgstr "" +msgstr "K překontrolování účetním." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase #: report:purchase.order:0 msgid "Taxes :" -msgstr "" +msgstr "Daně :" #. module: purchase #: field:purchase.order,invoiced_rate:0 #: field:purchase.order.line,invoiced:0 msgid "Invoiced" -msgstr "" +msgstr "Fakturováno" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,category_id:0 msgid "Category" -msgstr "" +msgstr "Kategorie" #. module: purchase #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 msgid "State of the Purchase Order." -msgstr "" +msgstr "Stav nákupní objednávky." #. module: purchase #: view:purchase.report:0 msgid " Year " -msgstr "" +msgstr " Rok " #. module: purchase #: field:purchase.report,state:0 msgid "Order State" -msgstr "" +msgstr "Stav objednávky" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice msgid "Create invoices" -msgstr "" +msgstr "Vytvořit faktury" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line #: view:purchase.order.line:0 #: field:stock.move,purchase_line_id:0 msgid "Purchase Order Line" -msgstr "" +msgstr "Řádek nákupní objednávky" #. module: purchase #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy." #. module: purchase #: view:purchase.order:0 msgid "Calendar View" -msgstr "" +msgstr "Kalendářový pohled" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_group msgid "Purchase Order Merge" -msgstr "" +msgstr "Sloučení nákupní objednávky" #. module: purchase #: report:purchase.quotation:0 msgid "Regards," -msgstr "" +msgstr "S pozdravem," #. module: purchase #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier #: view:purchase.report:0 msgid "Negotiation by Supplier" -msgstr "" +msgstr "Vyjednáno dodavatelem" #. module: purchase #: view:res.partner:0 msgid "Purchase Properties" -msgstr "" +msgstr "Vlastnosti nákupu" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1027,114 +1057,115 @@ msgstr "" #. module: purchase #: field:purchase.order,amount_untaxed:0 msgid "Untaxed Amount" -msgstr "" +msgstr "Nezdaněná částka" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "Indikuje, že faktura již byla zaplacena." #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 msgid "Outgoing products to invoice" -msgstr "" +msgstr "Odchozí výrobky k fakturaci" #. module: purchase #: view:purchase.installer:0 msgid "Configure" -msgstr "" +msgstr "Nastavit" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_qty_per_product #: view:purchase.report:0 msgid "Qty. per product" -msgstr "" +msgstr "Množ. na výrobek" #. module: purchase #: constraint:stock.move:0 msgid "You try to assign a lot which is not from the same product" -msgstr "" +msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "" +msgstr "Datum vytvoření dokumentu" #. module: purchase #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Prodej & Nákup" #. module: purchase #: selection:purchase.report,month:0 msgid "June" -msgstr "" +msgstr "Červen" #. module: purchase #: model:ir.model,name:purchase.model_purchase_report msgid "Purchases Orders" -msgstr "" +msgstr "Nákupní objednávky" #. module: purchase #: view:purchase.order.line:0 msgid "Manual Invoices" -msgstr "" +msgstr "Ruční faktury" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" -msgstr "" +msgstr "Někdo právě potvrdil nákup za částku větší než je limit" #. module: purchase #: selection:purchase.report,month:0 msgid "November" -msgstr "" +msgstr "Listopad" #. module: purchase #: view:purchase.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Rozšířené filtry..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" -msgstr "" +msgstr "Pro tento výrobek nebyl definován nákladový účet: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" +"Nejprve musíte zrušit všechny faktury připojené k této prodejní objednávce." #. module: purchase #: code:addons/purchase/wizard/purchase_order_group.py:48 #, python-format msgid "Please select multiple order to merge in the list view." -msgstr "" +msgstr "Prosíme vyberte ze seznamu více objednávek ke sloučení." #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 msgid "Pick list generated" -msgstr "" +msgstr "Vygenerován seznam navádění" #. module: purchase #: view:purchase.order:0 msgid "Exception" -msgstr "" +msgstr "Výjimka" #. module: purchase #: selection:purchase.report,month:0 msgid "October" -msgstr "" +msgstr "Říjen" #. module: purchase #: view:purchase.order:0 msgid "Compute" -msgstr "" +msgstr "Spočítat" #. module: purchase #: model:ir.module.module,description:purchase.module_meta_information @@ -1152,86 +1183,89 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " "less." msgstr "" +"Vybraný dodavatel má minimální množství nastaveno na %s, nemůžete objednat " +"méně." #. module: purchase #: selection:purchase.report,month:0 msgid "January" -msgstr "" +msgstr "Leden" #. module: purchase #: model:ir.model,name:purchase.model_res_company msgid "Companies" -msgstr "" +msgstr "Společnosti" #. module: purchase #: view:purchase.order:0 msgid "Cancel Purchase Order" -msgstr "" +msgstr "Zrušit nákupní objednávku" #. module: purchase #: constraint:stock.move:0 msgid "You must assign a production lot for this product" -msgstr "" +msgstr "Pro tento výrobek musíte přiřadit výrobní dávku." #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 msgid "A pick list is generated to track the incoming products." -msgstr "" +msgstr "Naváděcí seznam vygenerován pro sledování příchozích výrobků." #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard msgid "Dashboard" -msgstr "" +msgstr "Nástěnka" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_standard:0 msgid "Products Value" -msgstr "" +msgstr "Hodnota výrobků" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type msgid "Pricelists Types" -msgstr "" +msgstr "Typy ceníků" #. module: purchase #: view:purchase.order:0 #: view:purchase.report:0 msgid "Quotations" -msgstr "" +msgstr "Cenové nabídky" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree #: view:purchase.report:0 msgid "Purchase order per month" -msgstr "" +msgstr "Nákupních objednávky podle měsíce" #. module: purchase #: view:purchase.order.line:0 msgid "History" -msgstr "" +msgstr "Historie" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form msgid "Products by Category" -msgstr "" +msgstr "Výrobky podle kategorie" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay:0 msgid "Days to Validate" -msgstr "" +msgstr "Dnů k ověření" #. module: purchase #: help:purchase.order,origin:0 msgid "Reference of the document that generated this purchase order request." msgstr "" +"Odkaz na dokument, který vygeneroval tento požadavek na nákupní objednávku." #. module: purchase #: help:purchase.order,state:0 @@ -1247,62 +1281,62 @@ msgstr "" #. module: purchase #: field:purchase.order.line,price_subtotal:0 msgid "Subtotal" -msgstr "" +msgstr "Mezivýsledek" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_rfq #: model:ir.ui.menu,name:purchase.menu_purchase_rfq msgid "Requests for Quotation" -msgstr "" +msgstr "Vyžádání ocenění" #. module: purchase #: help:purchase.order,date_approve:0 msgid "Date on which purchase order has been approved" -msgstr "" +msgstr "Datum, kdy byla schválena nákupní objednávka" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting" -msgstr "" +msgstr "Čekající" #. module: purchase #: model:product.pricelist.version,name:purchase.ver0 msgid "Default Purchase Pricelist Version" -msgstr "" +msgstr "Výchozí verze ceníku nákupů" #. module: purchase #: view:purchase.installer:0 msgid "" "Extend your Purchases Management Application with additional functionalities." -msgstr "" +msgstr "Rozšířuje vaši aplikaci Řízení nákupů o doplňují funkce." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_install_module #: view:purchase.installer:0 msgid "Purchases Application Configuration" -msgstr "" +msgstr "Nastavení Nákupní aplikace" #. module: purchase #: field:purchase.order,fiscal_position:0 msgid "Fiscal Position" -msgstr "" +msgstr "Finanční pozice" #. module: purchase #: report:purchase.order:0 msgid "Request for Quotation N°" -msgstr "" +msgstr "Požadavek na ocenění N°" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0 msgid "Invoice" -msgstr "" +msgstr "Faktura" #. module: purchase #: selection:purchase.report,month:0 msgid "December" -msgstr "" +msgstr "Prosinec" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0 @@ -1311,18 +1345,18 @@ msgstr "" #: view:purchase.order.group:0 #: view:purchase.order.line_invoice:0 msgid "Cancel" -msgstr "Storno" +msgstr "Zrušit" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Purchase Order Lines" -msgstr "" +msgstr "Řádky nákupní objednávky" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 msgid "The supplier approves the Purchase Order." -msgstr "" +msgstr "Dodavatel potvrdil Nákupní objednávku" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -1330,108 +1364,108 @@ msgstr "" #: model:ir.ui.menu,name:purchase.menu_purchase_form_action #: view:purchase.report:0 msgid "Purchase Orders" -msgstr "" +msgstr "Nákupní objednávky" #. module: purchase #: field:purchase.order,origin:0 msgid "Source Document" -msgstr "" +msgstr "Zdrojový dokument" #. module: purchase #: view:purchase.order.group:0 msgid "Merge orders" -msgstr "Sloučit objednávky(Merge orders)" +msgstr "Sloučit objednávky" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line_invoice msgid "Purchase Order Line Make Invoice" -msgstr "" +msgstr "Řádek nákupní objednávky vytváří fakturu" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 msgid "Incoming Shipments" -msgstr "" +msgstr "Příchozí zásilka" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all msgid "Total Orders by User per month" -msgstr "" +msgstr "Celkem objednávek podle uživatele podle měsíce" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Request for Quotation" -msgstr "" +msgstr "Požadavek na cenovou nabídku" #. module: purchase #: report:purchase.order:0 msgid "Tél. :" -msgstr "" +msgstr "Tel. :" #. module: purchase #: field:purchase.order,create_uid:0 #: view:purchase.report:0 #: field:purchase.report,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Odopovědné" #. module: purchase #: report:purchase.order:0 msgid "Our Order Reference" -msgstr "" +msgstr "Náš objednávací odkaz" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Search Purchase Order" -msgstr "" +msgstr "Hledat nákupní objednávku" #. module: purchase #: field:purchase.order,warehouse_id:0 #: view:purchase.report:0 #: field:purchase.report,warehouse_id:0 msgid "Warehouse" -msgstr "" +msgstr "Sklad" #. module: purchase #: model:process.node,note:purchase.process_node_draftpurchaseorder0 #: model:process.node,note:purchase.process_node_draftpurchaseorder1 msgid "Request for Quotations." -msgstr "" +msgstr "Vyžádat ocenění" #. module: purchase #: report:purchase.order:0 msgid "Date Req." -msgstr "" +msgstr "Datum pož." #. module: purchase #: field:purchase.order,date_approve:0 #: field:purchase.report,date_approve:0 msgid "Date Approved" -msgstr "" +msgstr "Datum schválení" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" -msgstr "" +msgstr "Nelze zrušit tuto nákupní objednávku !" #. module: purchase #: report:purchase.order:0 #: field:purchase.order.line,price_unit:0 msgid "Unit Price" -msgstr "" +msgstr "Cena za kus" #. module: purchase #: view:purchase.order:0 msgid "Delivery & Invoicing" -msgstr "" +msgstr "Doručení & Fakturace" #. module: purchase #: field:purchase.order.line,date_planned:0 msgid "Scheduled Date" -msgstr "" +msgstr "Plánovaný datum" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase @@ -1441,41 +1475,41 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,product_id:0 msgid "Product" -msgstr "" +msgstr "Výrobek" #. module: purchase #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1 msgid "Confirmation" -msgstr "" +msgstr "Potvrzení" #. module: purchase #: report:purchase.order:0 #: field:purchase.order.line,name:0 #: report:purchase.quotation:0 msgid "Description" -msgstr "" +msgstr "Popis" #. module: purchase #: help:res.company,po_lead:0 msgid "This is the leads/security time for each purchase order." -msgstr "" +msgstr "Toto je Čekací/Ochranná lhůta pro nákupní objednávku." #. module: purchase #: report:purchase.quotation:0 msgid "Expected Delivery address:" -msgstr "" +msgstr "Očekávaná adresa doručení:" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po msgid "Receptions Analysis" -msgstr "" +msgstr "Analýza přijímání" #. module: purchase #: help:purchase.order,amount_untaxed:0 msgid "The amount without tax" -msgstr "" +msgstr "Částka bez daně" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_supplier_address_form @@ -1488,46 +1522,46 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Delivery" -msgstr "" +msgstr "Dodání" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_draft msgid "Request for Quotations" -msgstr "" +msgstr "Vyžádat ocenění" #. module: purchase #: field:purchase.order.line,product_uom:0 msgid "Product UOM" -msgstr "" +msgstr "MJ výrobku" #. module: purchase #: report:purchase.order:0 #: report:purchase.quotation:0 msgid "Qty" -msgstr "" +msgstr "Množ." #. module: purchase #: field:purchase.order,partner_address_id:0 msgid "Address" -msgstr "" +msgstr "Adresa" #. module: purchase #: field:purchase.order.line,move_ids:0 msgid "Reservation" -msgstr "" +msgstr "Rezervace" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph #: view:purchase.report:0 msgid "Total Qty and Amount by month" -msgstr "" +msgstr "Celkové množ. a částka za měsíc" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" -msgstr "" +msgstr "Nelze zrušit nákupní objednávku !" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1 @@ -1535,27 +1569,29 @@ msgid "" "In case there is no supplier for this product, the buyer can fill the form " "manually and confirm it. The RFQ becomes a confirmed Purchase Order." msgstr "" +"Kupec může vyplnit a potvrdit formulář ručně v případě, že není žádný " +"dodavatel výrobku. RFQ se stane potvrzenou nákupní objednávkou." #. module: purchase #: selection:purchase.report,month:0 msgid "February" -msgstr "" +msgstr "Únor" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase msgid "Products Categories" -msgstr "" +msgstr "Kategorie výrobků" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all msgid "Purchase Analysis" -msgstr "" +msgstr "Analýza nákupů" #. module: purchase #: report:purchase.order:0 msgid "Your Order Reference" -msgstr "" +msgstr "Váš odkaz objednávky" #. module: purchase #: view:purchase.order:0 @@ -1563,44 +1599,44 @@ msgstr "" #: report:purchase.quotation:0 #: field:purchase.report,expected_date:0 msgid "Expected Date" -msgstr "" +msgstr "Očekávaný datum" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state #: view:purchase.report:0 msgid "Total price by product by state" -msgstr "" +msgstr "Celková cena podle výrobku podle stavu" #. module: purchase #: report:purchase.quotation:0 msgid "TVA:" -msgstr "" +msgstr "TVA :" #. module: purchase #: report:purchase.order:0 #: field:purchase.order,date_order:0 msgid "Date Ordered" -msgstr "" +msgstr "Datum objednání" #. module: purchase #: report:purchase.order:0 msgid "Shipping address :" -msgstr "" +msgstr "Dodací adresa :" #. module: purchase #: view:purchase.order:0 msgid "Purchase Control" -msgstr "" +msgstr "Ovládání nákupů" #. module: purchase #: selection:purchase.report,month:0 msgid "March" -msgstr "" +msgstr "Březen" #. module: purchase #: selection:purchase.report,month:0 msgid "April" -msgstr "" +msgstr "Duben" #. module: purchase #: view:purchase.order.group:0 @@ -1622,38 +1658,38 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,name:0 msgid "Year" -msgstr "" +msgstr "Rok" #. module: purchase #: field:purchase.report,negociation:0 msgid "Purchase-Standard Price" -msgstr "" +msgstr "Standardní ceny nákupů" #. module: purchase #: model:product.pricelist.type,name:purchase.pricelist_type_purchase #: field:res.partner,property_product_pricelist_purchase:0 msgid "Purchase Pricelist" -msgstr "" +msgstr "Ceník nákupů" #. module: purchase #: field:purchase.order,invoice_method:0 msgid "Invoicing Control" -msgstr "" +msgstr "Řízení fakturace" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0 msgid "Approve" -msgstr "" +msgstr "Schválit" #. module: purchase #: view:purchase.order:0 msgid "To Approve" -msgstr "" +msgstr "Ke schválení" #. module: purchase #: view:purchase.order.line:0 msgid "Invoicing" -msgstr "" +msgstr "Fakturování" #. module: purchase #: help:purchase.order.line,state:0 @@ -1668,64 +1704,62 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." -msgstr "" +msgstr "Nákupní objednávka '%s' zrušena." #. module: purchase #: field:purchase.order,amount_total:0 msgid "Total" -msgstr "" +msgstr "Celkem" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase msgid "Pricelist Versions" -msgstr "" +msgstr "Verze ceníku" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_supplier_address_form msgid "Addresses" -msgstr "" +msgstr "Adresy" #. module: purchase #: view:purchase.order.group:0 msgid "Are you sure you want to merge these orders ?" -msgstr "" -"Opravdu chcete tyto obejdnávky sloučit?(Are you sure you want to merge these " -"orders ?)" +msgstr "Opravdu chcete tyto objednávky sloučit?" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 #: view:purchase.report:0 msgid "Group By..." -msgstr "" +msgstr "Seskupit podle..." #. module: purchase #: model:process.transition,name:purchase.process_transition_purchaseinvoice0 msgid "From a purchase order" -msgstr "" +msgstr "Z nákupní objednávky" #. module: purchase #: report:purchase.order:0 msgid "TVA :" -msgstr "" +msgstr "TVA :" #. module: purchase #: help:purchase.order,amount_total:0 msgid "The total amount" -msgstr "" +msgstr "Celková částka" #. module: purchase #: selection:purchase.report,month:0 msgid "May" -msgstr "" +msgstr "Květen" #. module: purchase #: field:res.company,po_lead:0 msgid "Purchase Lead Time" -msgstr "" +msgstr "Čekací čas nákupu" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0 @@ -1734,51 +1768,56 @@ msgid "" "order is 'On order'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"Faktura je vytvořena automaticky, pokud Řízení faktury nákupní objednávky je " +"'Objednáno'. Faktura může být generována také ručně účetním (Řízení " +"fakturace = Ruční)." #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 msgid "Purchase" -msgstr "" +msgstr "Nákup" #. module: purchase #: model:ir.model,name:purchase.model_res_partner #: field:purchase.order.line,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" "Please set one partner before choosing a product." msgstr "" +"Musíte vybrat partnera v nákupním formuláři !\n" +"Prosíme před výběrem výrobku nastavte jednoho partnera." #. module: purchase #: view:purchase.installer:0 msgid "title" -msgstr "" +msgstr "název" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_move msgid "Partial Move" -msgstr "" +msgstr "Částečný přesun" #. module: purchase #: view:purchase.order.line:0 msgid "Stock Moves" -msgstr "" +msgstr "Skladové pohyby" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action msgid "Units of Measure" -msgstr "" +msgstr "Měrné jednotky" #. module: purchase #: view:purchase.report:0 msgid "Orders" -msgstr "" +msgstr "Objednávky" #. module: purchase #: help:purchase.order,name:0 @@ -1786,9 +1825,20 @@ msgid "" "unique number of the purchase order,computed automatically when the purchase " "order is created" msgstr "" +"unikátní číslo nákupní objednávky, spočítané automaticky, když je vytvořena " +"nákupní objednávka" #. module: purchase #: model:ir.actions.act_window,name:purchase.open_board_purchase #: model:ir.ui.menu,name:purchase.menu_board_purchase msgid "Purchase Dashboard" -msgstr "" +msgstr "Nástěnka nákupu" + +#~ msgid "From Picking" +#~ msgstr "Z navádění" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Nefakturované nákupní řádky" + +#~ msgid "Invalid model name in the action definition." +#~ msgstr "Neplatné jméno modelu v definici akce." diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po index 82a21de7fd6..103791c9f0c 100644 --- a/addons/purchase/i18n/de.po +++ b/addons/purchase/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -28,7 +28,7 @@ msgstr "" "Beschaffungsauftrag (Bestellung)." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -47,7 +47,7 @@ msgid "Destination" msgstr "Zielort" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -85,8 +85,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Rechnung durch Lieferung" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -132,7 +132,7 @@ msgstr "" "Eingangsrechnung vornehmen." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -156,7 +156,7 @@ msgid "From a Pick list" msgstr "vom Lieferauftrag" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Keine Preisliste!" @@ -250,7 +250,7 @@ msgid "Partial Picking" msgstr "Lieferung Teilmenge" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Beschaffungsauftrag '%s' wurde bestätigt." @@ -297,7 +297,7 @@ msgid "Notes" msgstr "Bemerkungen" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -378,7 +378,7 @@ msgid "Cancelled" msgstr "Abgebrochen" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Beschaffungswert übersteigt Limit" @@ -432,7 +432,7 @@ msgid "Reference" msgstr "Referenz" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Einkaufsaufträge mit dem Status %s können nicht gelöscht werden" @@ -454,7 +454,7 @@ msgid "Day" msgstr "Tag" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Beschaffungsauftrag '%s' wurde in Entwurf Status versetzt" @@ -471,8 +471,8 @@ msgid "# of Lines" msgstr "# Positionen" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -509,7 +509,7 @@ msgid "It indicates that a picking has been done" msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Falsche Mengeneinheit!" @@ -615,7 +615,7 @@ msgid "Order Lines" msgstr "Auftragszeilen" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Kein Partner!" @@ -672,9 +672,9 @@ msgid "Invoices generated for a purchase order" msgstr "Erstellte Eingangsrechnung für Beschaffungsauftrag" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -739,7 +739,7 @@ msgid "Reservation Destination" msgstr "Reservierung Auslieferungsziel" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Fehlerhafte Aktion" @@ -824,7 +824,7 @@ msgid " Month-1 " msgstr " Monat-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -837,7 +837,7 @@ msgid "Manual" msgstr "Manuelle Rechnung" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -961,7 +961,6 @@ msgid "Month" msgstr "Monat" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Erwarte Auftragsbestätigung" @@ -1014,8 +1013,14 @@ msgstr "Zu erneuern durch den Finanzbuchhalter" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Nicht berechnete Produktzugänge" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1163,7 +1168,7 @@ msgid "Manual Invoices" msgstr "Erzeuge Rechnungen" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1182,7 +1187,7 @@ msgid "Extended Filters..." msgstr "Erweiterter Filter..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1190,7 +1195,7 @@ msgstr "" "Es ist kein Aufwandskonto für dieses Produkt hinterlegt: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1250,7 +1255,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1523,7 +1528,7 @@ msgid "Date Approved" msgstr "Datum Annahme" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Konnte den Beschaffungsauftrag nicht abbrechen!" @@ -1641,7 +1646,7 @@ msgid "Total Qty and Amount by month" msgstr "Gesamtmenge und Umsatz nach Monaten" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Konnte Beschaffungsvorgang nicht abbrechen!" @@ -1809,7 +1814,7 @@ msgstr "" "einen Beschaffungsauftrag abbricht." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Beschaffungsauftrag '%s' wurde abgebrochen" @@ -1891,7 +1896,7 @@ msgid "Partner" msgstr "Partner" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1941,23 +1946,9 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Pinnwand Einkauf" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "" -#~ "Sie können keine sich zeitlich überlappende Versionen von Preislisten haben." - #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Vorab Eingangsrechnung zur Wareneingangskontrolle" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Bitte berücksichtige folgendes: Aufträge werden nur zusammengefasst wenn Sie " -#~ "an denselben Partner gerichtet sind und der Wareneingang denselben Lagerort " -#~ "betrifft. Außerdem werden Einzelpositionen nur zusammengefasst wenn sie " -#~ "exakt gleich sind (bis auf Menge und Einheit)." - #~ msgid "Packing" #~ msgstr "Packliste" @@ -1973,9 +1964,6 @@ msgstr "Pinnwand Einkauf" #~ msgid "Purchase Orders in Progress" #~ msgstr "Beschaffungsaufträge (in Bearbeitung)" -#~ msgid "N°" -#~ msgstr "Nr." - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Bestätigter Beschaffungsauftrag" @@ -2152,142 +2140,25 @@ msgstr "Pinnwand Einkauf" #~ msgid "Date" #~ msgstr "Datum" -#~ msgid "Manual in progress" -#~ msgstr "Auftrag in manueller Bearbeitung" - -#~ msgid "In progress" -#~ msgstr "In Bearbeitung" - -#~ msgid "Waiting Schedule" -#~ msgstr "Warteliste" - -#~ msgid "Quotation" -#~ msgstr "Angebot" - #~ msgid "Invalid model name in the action definition." #~ msgstr "Ungültiger Modulname in der Aktionsdefinition." -#~ msgid "To be Invoiced" -#~ msgstr "Abzurechnen" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "Die Zertifikat ID sollte eindeutig sein" - -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "" -#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer " -#~ "vorhanden sein !" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Eine Eingangsrechnung für einen Beschaffungsauftrag" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen." - -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "Über das Menü Beschaffungsaufträge, können Sie den Status Ihrer Bestellungen " -#~ "rückverfolgen: Haben Sie die Produkte erhalten, wurde eine Rechnung " -#~ "erstellt, ist die Rechnung gebucht und ist die Rechnung bereits bezahlt oder " -#~ "nach wie vor offen.\n" - -#~ msgid "The name of the group must be unique !" -#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein" - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "Nutzen Sie dieses Menü für die Erfassung und Rückverfolgung von " -#~ "Eingangsrechnungen. OpenERP erzeugt vorab Rechnungen im Status Entwurf " -#~ "entweder bereits auf Basis der Bestellung oder später durch den " -#~ "Wareneingang. Sobald Sie dann die tatsächliche Rechnung ihres Lieferanten " -#~ "erhalten, können Sie diese Rechnung mit dem Entwurf abgleichen und die " -#~ "Eingangsrechnung buchen." - #~ msgid "" #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList " #~ "Item!" #~ msgstr "" #~ "Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen." -#~ msgid "The name of the module must be unique !" -#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !" - -#~ msgid "" -#~ " Please note that: \n" -#~ " \n" -#~ " Orders will only be merged if: \n" -#~ " * Purchase Orders are in draft \n" -#~ " * Purchase Orders belong to the same supplier \n" -#~ " * Purchase Orders are have same stock location, same pricelist \n" -#~ " \n" -#~ " Lines will only be merged if: \n" -#~ " * Order lines are exactly the same except for the product,quantity and " -#~ "unit \n" -#~ " " -#~ msgstr "" -#~ " Bitte beachten Sie folgendes: \n" -#~ "\n" -#~ " Aufträge werden nur zusammengefasst, wenn folgendes zutreffend ist:\n" -#~ " * Beschaffungsauftrag im Entwurf\n" -#~ " * Beschaffungsaufträge beim selben Lieferanten\n" -#~ " * Beschaffungsaufträge beinhalten identische Lagerorte, sowie eine " -#~ "identische Preisliste.\n" -#~ "\n" -#~ "Auftragspositionen werden nur zusammengefasst, wenn folgendes zutreffend " -#~ "ist:\n" -#~ " * Die Auftragsposition ist exakt identisch, bis auf: Produkt, Menge und " -#~ "Einheit \n" -#~ " " - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !" - -#~ msgid "" -#~ "With the Requests for quotation menu you can create new request for " -#~ "quotations, review existing one and confirm them to order once the supplier " -#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a " -#~ "Purchase Order and generate the next steps: draft reception of the products, " -#~ "invoice to control." -#~ msgstr "" -#~ "Durch das Menü Angebotsanfragen können Sie neue Angebote bei Lieferanten " -#~ "anfragen, bestehende Anfragen rückverfolgen, eine Bestellung tätigen sowie " -#~ "die Auftragsbestätigung durch den Lieferanten eingeben. Durch Ihre " -#~ "Bestellung wird dann ein Beschaffungsauftrag erzeugt, der wiederum folgende " -#~ "weitere Wokflows auslöst: Erstellung eines Wareneingangslieferscheins im " -#~ "Status Entwurf, Eingangsrechnung im Entwurf zur Rechnungskontrolle." +#~ msgid "From Picking" +#~ msgstr "Rechnung durch Lieferung" -#~ msgid "" -#~ "Access your supplier records and maintain your relationship with them. You " -#~ "can track all your interactions with them through the history tab: emails, " -#~ "orders, meeting, etc." -#~ msgstr "" -#~ "Verwenden Sie die Daten zu Ihren Lieferanten und nutzen Sie das Supplier " -#~ "Relationship Management. Sie können über den Aktenreiter Historie bei Ihren " -#~ "Lieferanten folgende Informationen einsehen: Gesendete EMails, Bestellungen, " -#~ "Gemeinsame Termine, etc." - -#~ msgid "Product UoM" -#~ msgstr "Produkt ME" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Nicht berechnete Produktzugänge" +#, python-format #~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." +#~ "You have to select a pricelist in the purchase form !\n" +#~ "Please set one before choosing a product." #~ msgstr "" -#~ "Wenn Sie beim Beschaffungsauftrag für die Einstellung zur Erstellung einer " -#~ "Rechnung \"Manuelle Rechnung\" gewählt haben, können Sie hier " -#~ "nachvollziehen, für welche Auftragspositionen Sie bislang noch keine " -#~ "Rechnung von Ihrem Lieferanten bekommen haben. Sobald Sie dann eine " -#~ "Eingangsrechnung empfangen, können Sie auch eine Eingangsrechnung zunächst " -#~ "im Status Entwurf auf Basis der Auftragspositionen über dieses Menü " -#~ "erstellen." +#~ "Sie müssen eine Preisliste im Einkaufsformular auswählen, bevor Sie ein " +#~ "Produkt auswählen." diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po index c6d1ced46c3..5fcb83f83fb 100644 --- a/addons/purchase/i18n/el.po +++ b/addons/purchase/i18n/el.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" @@ -27,7 +27,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -45,7 +45,7 @@ msgid "Destination" msgstr "Προορισμός" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -74,8 +74,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Από Συλλογή" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -116,7 +116,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -139,7 +139,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Δεν υπάρχει Τιμοκατάλογος!" @@ -233,7 +233,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -280,7 +280,7 @@ msgid "Notes" msgstr "Σημειώσεις" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -354,7 +354,7 @@ msgid "Cancelled" msgstr "Ακυρωμένη" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -408,7 +408,7 @@ msgid "Reference" msgstr "Παραπομπή" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -431,7 +431,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -448,8 +448,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -486,7 +486,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Λάθος ΜΟΜ Προϊόντος" @@ -586,7 +586,7 @@ msgid "Order Lines" msgstr "Γραμμές Παραγγελίας" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Δεν υπάρχει Συνεργάτης!" @@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -695,7 +695,7 @@ msgid "Reservation Destination" msgstr "Προορσιμός Κράτησης" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Άκυρη Ενέργεια!" @@ -773,7 +773,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -784,7 +784,7 @@ msgid "Manual" msgstr "Μη Αυτόματη" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -900,7 +900,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -954,7 +953,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1098,7 +1103,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1115,14 +1120,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Δεν έχει δηλωθεί λογαριασμός εξόδων για το προϊόν: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1171,7 +1176,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1437,7 +1442,7 @@ msgid "Date Approved" msgstr "Ημερ/νία Έγκρισης" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!" @@ -1549,7 +1554,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!" @@ -1693,7 +1698,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1770,7 +1775,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1821,15 +1826,8 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Τιμολόγιο Προμηθευτή προ-δημιουργημένο για έλεγχο κατά την παραλάβη" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Παρακαλώ, σημειώστε ότι οι παραγγελίες θα συγχωνευθούν μόνο αν προέρχονται " -#~ "από τον ίδιο προμηθευτή και έχουν τον ίδιο προορισμό. Οι γραμμές θα " -#~ "συγχωνευθούν μόνο αν είναι ολόιδιες, με εξαίρεση τις ποσότητες και τις " -#~ "μονάδες μέτρησης." +#~ msgid "From Picking" +#~ msgstr "Από Συλλογή" #~ msgid "Packing" #~ msgstr "Συσκευασία" @@ -1846,9 +1844,6 @@ msgstr "" #~ msgid "Purchase Orders in Progress" #~ msgstr "Παραγγελίες Αγορών σε Εξέλιξη" -#~ msgid "N°" -#~ msgstr "N°" - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Η Παραγγελία Αγοράς επιβεβαιώθηκε από το χρήστη" @@ -2019,10 +2014,6 @@ msgstr "" #~ msgid "From Packing list, Create invoice." #~ msgstr "Δημιουργία Τιμολογίου από Κατάσταση Συσκευασίας" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "" -#~ "Δεν μπορείτε να έχετε 2 εκδόσεις τιμοκαταλόγου που αλληλοκαλύπτονται!" - #~ msgid "Approving Purchase Order" #~ msgstr "Έγκριση Παραγγελιών Αγοράς" @@ -2039,12 +2030,3 @@ msgstr "" #~ msgid "Date" #~ msgstr "Ημερομηνία" - -#~ msgid "Manual in progress" -#~ msgstr "Χειροκίνητο σε εξέλιξη" - -#~ msgid "Quotation" -#~ msgstr "Προσφορά" - -#~ msgid "In progress" -#~ msgstr "Σε εξέλιξη" diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po index f7efd865edf..934482f6b8f 100644 --- a/addons/purchase/i18n/en_GB.po +++ b/addons/purchase/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,7 +70,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -221,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -268,7 +268,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -342,7 +342,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -396,7 +396,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -418,7 +418,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -435,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -573,7 +573,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -682,7 +682,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -760,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,7 +771,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -885,7 +885,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -938,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1082,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1104,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1153,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1413,7 +1418,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1525,7 +1530,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1669,7 +1674,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1746,7 +1751,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po index f4c7760a1d5..16e79d63699 100644 --- a/addons/purchase/i18n/es.po +++ b/addons/purchase/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -27,7 +27,7 @@ msgstr "" "confirmado." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -46,7 +46,7 @@ msgid "Destination" msgstr "Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -83,8 +83,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Desde albarán" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -128,7 +128,7 @@ msgstr "" "productos recibidos, y controlar las facturas de los proveedores." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "El proveedor seleccionado sólo vende este producto por %s" @@ -151,7 +151,7 @@ msgid "From a Pick list" msgstr "Desde un albarán" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "¡No tarifa!" @@ -244,7 +244,7 @@ msgid "Partial Picking" msgstr "Albarán parcial" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Pedido de compra '%s' está confirmado." @@ -291,7 +291,7 @@ msgid "Notes" msgstr "Notas" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -369,7 +369,7 @@ msgid "Cancelled" msgstr "Cancelado" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Importe de compra por encima del límite" @@ -423,7 +423,7 @@ msgid "Reference" msgstr "Referencia" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!" @@ -445,7 +445,7 @@ msgid "Day" msgstr "Día" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Pedido de compra '%s' se ha cambiado al estado borrador." @@ -462,8 +462,8 @@ msgid "# of Lines" msgstr "Nº de líneas" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done" msgstr "Indica que un albarán ha sido realizado." #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "¡UdM del producto errónea!" @@ -605,7 +605,7 @@ msgid "Order Lines" msgstr "Líneas del pedido" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "¡Falta empresa!" @@ -660,9 +660,9 @@ msgid "Invoices generated for a purchase order" msgstr "Facturas generadas para un pedido de compra" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -727,7 +727,7 @@ msgid "Reservation Destination" msgstr "Destinación de la reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "¡Acción no válida!" @@ -811,7 +811,7 @@ msgid " Month-1 " msgstr " Mes-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)" @@ -822,7 +822,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -945,7 +945,6 @@ msgid "Month" msgstr "Mes" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Esperando aceptación proveedor" @@ -998,8 +997,14 @@ msgstr "Para ser revisado por el contable." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Líneas de compra no facturadas" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1145,7 +1150,7 @@ msgid "Manual Invoices" msgstr "Facturas manuales" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1163,7 +1168,7 @@ msgid "Extended Filters..." msgstr "Filtros extendidos..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1171,7 +1176,7 @@ msgstr "" "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1229,7 +1234,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1500,7 +1505,7 @@ msgid "Date Approved" msgstr "Fecha aprobación" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "¡No se puede cancelar este pedido de compra!" @@ -1615,7 +1620,7 @@ msgid "Total Qty and Amount by month" msgstr "Ctdad total y importe por mes" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "¡No se puede cancelar el pedido de compra!" @@ -1782,7 +1787,7 @@ msgstr "" "cancela un pedido de compra." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "El pedido de compra '%s' está cancelado." @@ -1862,7 +1867,7 @@ msgid "Partner" msgstr "Empresa" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1912,9 +1917,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Tablero de compras" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!" - #, python-format #~ msgid "" #~ "You have to select a pricelist in the purchase form !\n" @@ -1934,14 +1936,8 @@ msgstr "Tablero de compras" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Factura de proveedor pre-generada en la recepción para control" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la " -#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán " -#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad." +#~ msgid "From Picking" +#~ msgstr "Desde albarán" #~ msgid "Packing" #~ msgstr "Empaquetado/Albarán" @@ -1958,9 +1954,6 @@ msgstr "Tablero de compras" #~ msgid "Purchase Orders in Progress" #~ msgstr "Pedidos de compra en proceso" -#~ msgid "N°" -#~ msgstr "Nº" - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Pedido de compra es confirmado por el usuario." @@ -2136,96 +2129,5 @@ msgstr "Tablero de compras" #~ "¡Error! No puede asignar la tarifa principal como otra tarifa en un " #~ "elemento de la tarifa." -#~ msgid "Manual in progress" -#~ msgstr "Manual en progreso" - -#~ msgid "Quotation" -#~ msgstr "Presupuesto" - -#~ msgid "In progress" -#~ msgstr "En progreso" - -#~ msgid "Waiting Schedule" -#~ msgstr "Esperando planificación" - -#~ msgid "To be Invoiced" -#~ msgstr "Para facturar" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "¡El ID del certificado del módulo debe ser único!" - -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Una factura generada por un pedido de compra." - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "¡Error! No puede crear menús recursivos." - -#~ msgid "The name of the group must be unique !" -#~ msgstr "¡El nombre del grupo debe ser único!" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "¡El nombre del módulo debe ser único!" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!" - -#~ msgid "" -#~ "Access your supplier records and maintain your relationship with them. You " -#~ "can track all your interactions with them through the history tab: emails, " -#~ "orders, meeting, etc." -#~ msgstr "" -#~ "Permite acceder a sus registros de proveedores y mantener su relación con " -#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la " -#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..." - -#~ msgid "Product UoM" -#~ msgstr "UdM del producto" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!" - -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: " -#~ "los productos recibidos, la factura recibida y controlada.\n" - -#~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." -#~ msgstr "" -#~ "Si se establece el control de la facturación de un pedido de compra como " -#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las " -#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté " -#~ "listo para recibir una factura de proveedor, puede generar una factura de " -#~ "proveedor en borrador basada en las líneas desde este menú." - -#~ msgid "" -#~ "With the Requests for quotation menu you can create new request for " -#~ "quotations, review existing one and confirm them to order once the supplier " -#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a " -#~ "Purchase Order and generate the next steps: draft reception of the products, " -#~ "invoice to control." -#~ msgstr "" -#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de " -#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del " -#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, " -#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes " -#~ "pasos: recepción en borrador de los productos, factura de control." - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "Utilice este menú para controlar las facturas que se reciban de su " -#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de " -#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, " -#~ "puede compararla con la factura borrador y validarla." +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Líneas de compra no facturadas" diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po index 17060a7d1a6..67411069dfa 100644 --- a/addons/purchase/i18n/es_AR.po +++ b/addons/purchase/i18n/es_AR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -71,8 +71,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Desde empaque" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -113,7 +113,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -136,7 +136,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Sin lista de precio !" @@ -230,7 +230,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -277,7 +277,7 @@ msgid "Notes" msgstr "notas" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -351,7 +351,7 @@ msgid "Cancelled" msgstr "Cancelado" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -405,7 +405,7 @@ msgid "Reference" msgstr "Referencia" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -427,7 +427,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -444,8 +444,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -482,7 +482,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UdM del producto errónea !" @@ -582,7 +582,7 @@ msgid "Order Lines" msgstr "Líneas de la orden" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "No hay partner !" @@ -631,9 +631,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -691,7 +691,7 @@ msgid "Reservation Destination" msgstr "Destino de la reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Acción no válida !" @@ -769,7 +769,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -780,7 +780,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -896,7 +896,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -949,7 +948,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1093,7 +1098,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1110,14 +1115,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "No hay cuenta de gastos definida para este producto: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1165,7 +1170,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1433,7 +1438,7 @@ msgid "Date Approved" msgstr "Fecha de aprobación" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "No se puede cancelar esta orden de compra!" @@ -1545,7 +1550,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "¡No se puede cancelar la orden de compra!" @@ -1689,7 +1694,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1766,7 +1771,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1815,18 +1820,12 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Factura de proveedor pre-generada en la recepción para control" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen al " -#~ "mismo partner y se dirigen a la misma ubicación, y las líneas sólo serán " -#~ "fusionadas si son iguales excepto la cantidad y unidad." - #~ msgid "Packing" #~ msgstr "Empaque" +#~ msgid "From Picking" +#~ msgstr "Desde empaque" + #~ msgid "Purchase Process" #~ msgstr "Proceso de compra" @@ -1836,9 +1835,6 @@ msgstr "" #~ msgid "Create invoice from product recept" #~ msgstr "Crear factura desde recepción producto" -#~ msgid "N°" -#~ msgstr "Nº" - #~ msgid "Purchase Orders in Progress" #~ msgstr "Órdenes de compra en proceso" @@ -1987,9 +1983,6 @@ msgstr "" #~ msgid "Approved Purchase" #~ msgstr "Compra aprobada" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "No puede tener 2 versiones de listas de precios que se superpongan!" - #~ msgid "Packing Invoice" #~ msgstr "Facturar remito" diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po index 410e170fdca..e265357e66c 100644 --- a/addons/purchase/i18n/es_CL.po +++ b/addons/purchase/i18n/es_CL.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -27,7 +27,7 @@ msgstr "" "confirmado." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -46,7 +46,7 @@ msgid "Destination" msgstr "Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -75,8 +75,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Desde albarán" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -120,7 +120,7 @@ msgstr "" "productos recibidos, y controlar las facturas de los proveedores." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "El proveedor seleccionado sólo vende este producto por %s" @@ -143,7 +143,7 @@ msgid "From a Pick list" msgstr "Desde un albarán" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "¡No tarifa!" @@ -236,7 +236,7 @@ msgid "Partial Picking" msgstr "Albarán parcial" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Pedido de compra '%s' está confirmado." @@ -283,7 +283,7 @@ msgid "Notes" msgstr "Notas" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -361,7 +361,7 @@ msgid "Cancelled" msgstr "Cancelado" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Importe de compra por encima del límite" @@ -415,7 +415,7 @@ msgid "Reference" msgstr "Referencia" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!" @@ -437,7 +437,7 @@ msgid "Day" msgstr "Día" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Pedido de compra '%s' se ha cambiado al estado borrador." @@ -454,8 +454,8 @@ msgid "# of Lines" msgstr "Nº de líneas" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done" msgstr "Indica que un albarán ha sido realizado" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "¡UdM del producto errónea!" @@ -597,7 +597,7 @@ msgid "Order Lines" msgstr "Líneas del pedido" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "¡Falta empresa!" @@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order" msgstr "Facturas generadas para un pedido de compra" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -719,7 +719,7 @@ msgid "Reservation Destination" msgstr "Destinación de la reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "¡Acción no válida!" @@ -803,7 +803,7 @@ msgid " Month-1 " msgstr " Mes-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)" @@ -814,7 +814,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -932,7 +932,6 @@ msgid "Month" msgstr "Mes" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Esperando aceptación proveedor" @@ -985,8 +984,14 @@ msgstr "Para ser revisado por el contable." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Líneas de compra no facturadas" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1132,7 +1137,7 @@ msgid "Manual Invoices" msgstr "Facturas manuales" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1150,7 +1155,7 @@ msgid "Extended Filters..." msgstr "Filtros extendidos..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1158,7 +1163,7 @@ msgstr "" "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1217,7 +1222,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1488,7 +1493,7 @@ msgid "Date Approved" msgstr "Fecha aprobación" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "¡No se puede cancelar este pedido de compra!" @@ -1603,7 +1608,7 @@ msgid "Total Qty and Amount by month" msgstr "Ctdad total y importe por mes" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "¡No se puede cancelar el pedido de compra!" @@ -1770,7 +1775,7 @@ msgstr "" "cancela un pedido de compra." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "El pedido de compra '%s' está cancelado." @@ -1850,7 +1855,7 @@ msgid "Partner" msgstr "Empresa" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1900,8 +1905,11 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Tablero de compras" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!" +#~ msgid "From Picking" +#~ msgstr "Desde albarán" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Líneas de compra no facturadas" #, python-format #~ msgid "" @@ -1922,15 +1930,6 @@ msgstr "Tablero de compras" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Factura de proveedor pre-generada en la recepción para control" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la " -#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán " -#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad." - #~ msgid "Packing" #~ msgstr "Empaquetado/Albarán" @@ -1946,9 +1945,6 @@ msgstr "Tablero de compras" #~ msgid "Purchase Orders in Progress" #~ msgstr "Pedidos de compra en proceso" -#~ msgid "N°" -#~ msgstr "Nº" - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Pedido de compra es confirmado por el usuario." @@ -2123,97 +2119,3 @@ msgstr "Tablero de compras" #~ msgstr "" #~ "¡Error! No puede asignar la tarifa principal como otra tarifa en un " #~ "elemento de la tarifa." - -#~ msgid "Manual in progress" -#~ msgstr "Manual en progreso" - -#~ msgid "Quotation" -#~ msgstr "Presupuesto" - -#~ msgid "In progress" -#~ msgstr "En progreso" - -#~ msgid "Waiting Schedule" -#~ msgstr "Esperando planificación" - -#~ msgid "To be Invoiced" -#~ msgstr "Para facturar" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "¡El ID del certificado del módulo debe ser único!" - -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Una factura generada por un pedido de compra." - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "¡Error! No puede crear menús recursivos." - -#~ msgid "The name of the group must be unique !" -#~ msgstr "¡El nombre del grupo debe ser único!" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "¡El nombre del módulo debe ser único!" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!" - -#~ msgid "" -#~ "Access your supplier records and maintain your relationship with them. You " -#~ "can track all your interactions with them through the history tab: emails, " -#~ "orders, meeting, etc." -#~ msgstr "" -#~ "Permite acceder a sus registros de proveedores y mantener su relación con " -#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la " -#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..." - -#~ msgid "Product UoM" -#~ msgstr "UdM del producto" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!" - -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: " -#~ "los productos recibidos, la factura recibida y controlada.\n" - -#~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." -#~ msgstr "" -#~ "Si se establece el control de la facturación de un pedido de compra como " -#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las " -#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté " -#~ "listo para recibir una factura de proveedor, puede generar una factura de " -#~ "proveedor en borrador basada en las líneas desde este menú." - -#~ msgid "" -#~ "With the Requests for quotation menu you can create new request for " -#~ "quotations, review existing one and confirm them to order once the supplier " -#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a " -#~ "Purchase Order and generate the next steps: draft reception of the products, " -#~ "invoice to control." -#~ msgstr "" -#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de " -#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del " -#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, " -#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes " -#~ "pasos: recepción en borrador de los productos, factura de control." - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "Utilice este menú para controlar las facturas que se reciban de su " -#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de " -#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, " -#~ "puede compararla con la factura borrador y validarla." diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po index 076c1e6fb0f..91790da2c7c 100644 --- a/addons/purchase/i18n/es_EC.po +++ b/addons/purchase/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -28,7 +28,7 @@ msgstr "" "confirmado." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -47,7 +47,7 @@ msgid "Destination" msgstr "Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -85,8 +85,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Desde inventario" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -130,7 +130,7 @@ msgstr "" "productos recibidos, y el control de las facturas de proveedores." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "El proveedor seleccionado sólo vende este producto por %s" @@ -153,7 +153,7 @@ msgid "From a Pick list" msgstr "Desde inventario" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "¡No tarifa!" @@ -246,7 +246,7 @@ msgid "Partial Picking" msgstr "Movimientos parciales" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Pedido de compra '%s' está confirmado." @@ -293,7 +293,7 @@ msgid "Notes" msgstr "Notas" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -369,7 +369,7 @@ msgid "Cancelled" msgstr "Cancelado" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -423,7 +423,7 @@ msgid "Reference" msgstr "Referencia" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "No se puede borrar las Ordenes de Compra que estan en estado %s !" @@ -445,7 +445,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -462,8 +462,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -600,7 +600,7 @@ msgid "Order Lines" msgstr "Líneas del pedido" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -649,9 +649,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -709,7 +709,7 @@ msgid "Reservation Destination" msgstr "Destinación de la reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -787,7 +787,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -798,7 +798,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -914,7 +914,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -967,7 +966,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1111,7 +1116,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1128,14 +1133,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1182,7 +1187,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1450,7 +1455,7 @@ msgid "Date Approved" msgstr "Fecha aprobación" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1562,7 +1567,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1706,7 +1711,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1783,7 +1788,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -2018,14 +2023,5 @@ msgstr "" #~ msgstr "" #~ "Después del pedido de compra aprobado, se convierte en factura de proveedor" -#~ msgid "Manual in progress" -#~ msgstr "Manual en progreso" - -#~ msgid "Quotation" -#~ msgstr "Cotización" - -#~ msgid "In progress" -#~ msgstr "En progreso" - -#~ msgid "Waiting Schedule" -#~ msgstr "Esperando Fecha" +#~ msgid "From Picking" +#~ msgstr "Desde inventario" diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po index 22a4f460d48..9f90b117261 100644 --- a/addons/purchase/i18n/et.po +++ b/addons/purchase/i18n/et.po @@ -13,11 +13,11 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Hinnakiri puudub !" @@ -46,7 +46,7 @@ msgid "From Order" msgstr "Tellimusest" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Vigane tegevus !" @@ -78,7 +78,7 @@ msgid "Invoicing Control" msgstr "Arveldamishaldus" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -98,7 +98,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -116,7 +116,7 @@ msgid "Destination" msgstr "Sihtpunkt" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -144,8 +144,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Noppest" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -186,7 +186,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -295,7 +295,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -342,7 +342,7 @@ msgid "Notes" msgstr "Märkused" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -398,7 +398,7 @@ msgid "Cancelled" msgstr "Tühistatud" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -452,7 +452,7 @@ msgid "Reference" msgstr "Viide" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -474,7 +474,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -491,8 +491,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -529,7 +529,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Vale toote MÜ!" @@ -629,7 +629,7 @@ msgid "Order Lines" msgstr "Korralduse read" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Puudub partner!" @@ -678,9 +678,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -799,7 +799,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -810,7 +810,7 @@ msgid "Manual" msgstr "Käsitsi" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -926,7 +926,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -979,7 +978,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1123,7 +1128,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1140,14 +1145,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Sellele tootele pole määratud kulukontot: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1196,7 +1201,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1457,7 +1462,7 @@ msgid "Date Approved" msgstr "Heaks kiitmise kuupäev" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Seda ostukorraldust ei saa tühistada !" @@ -1564,7 +1569,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Ostukorraldust ei saa tühistada !" @@ -1698,7 +1703,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1813,9 +1818,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni mis kattuvad!" - #, python-format #~ msgid "" #~ "You have to select a pricelist in the purchase form !\n" @@ -1833,9 +1835,6 @@ msgstr "" #~ msgid "Purchase Process" #~ msgstr "Ostuprotseduur" -#~ msgid "N°" -#~ msgstr "N°" - #~ msgid "Planned Date" #~ msgstr "Planeeritud kuupäev" @@ -1877,14 +1876,8 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Vastuvõtmistel kontrolliks eelgenereeritud tarnija arve" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Pane tähele, et korraldused liidetakse ainult siis, kui nad lähevad samale " -#~ "partnerile ja samasse kohta. Read liidetakse ainult siis, kui nad on täpselt " -#~ "samad välja arvatud kogus ja ühik." +#~ msgid "From Picking" +#~ msgstr "Noppest" #~ msgid "Packing" #~ msgstr "Pakkimine" @@ -2016,15 +2009,3 @@ msgstr "" #~ msgid "Date" #~ msgstr "Kuupäev" - -#~ msgid "Quotation" -#~ msgstr "Hinnapakkumine" - -#~ msgid "In progress" -#~ msgstr "Hetkel toimumas" - -#~ msgid "Waiting Schedule" -#~ msgstr "Ootegraafik" - -#~ msgid "Manual in progress" -#~ msgstr "Edenemisel käsitsi" diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po index 09189222864..b959189e770 100644 --- a/addons/purchase/i18n/fi.po +++ b/addons/purchase/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -23,12 +23,14 @@ msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." msgstr "" +"Ostajan on hyväksyttävä tarjouspyyntö ennen toimittajalle lähettämistä. " +"Tarjouspyynnöstä tulee hyväksytty ostotilaus." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "" +msgstr "Et voi vahvistaa ostotilausta ilman ostotilausrivejä." #. module: purchase #: field:purchase.order,invoiced:0 @@ -43,7 +45,7 @@ msgid "Destination" msgstr "Kohde" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,11 +71,18 @@ msgid "" "supplier invoices: based on the order, based on the receptions or manual " "encoding." msgstr "" +"Voit luoda tarjouspyynnön jos haluat ostaa tuotteita toimittajalta, mutta " +"ostoa ei ole vielä vahvisttu. Voit käyttää tätä valikkoa myös " +"tarkastellaksesi automaattisesti luotuja tarjouspyyntöjä jotka pohjautuvat " +"logistiikkasääntöihisi (minimivarasto, MTO jne.) Voit muuntaa tarjouspyynnön " +"ostotilaukseksi kun tilaus on vahvistettu. Jos käytät laajennettua liittymää " +"(käyttäjäasetukset), voit valita tavan jolla hallitaan toimittajien laskuja: " +"tilauksen pohjalta, vastaanoton pohjalta tai käsin syöttäen." #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Vastaanotossa" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -112,12 +121,15 @@ msgid "" "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." msgstr "" +"Käytä tätä valikkoa etsiäksesi ostotilauksia viitteiden, toimittajien, " +"tuotteiden yms. perusteella. Jokaista ostotilausta kohden, voit seurata " +"vastaanotettuja tuotteita ja hallita toimittajien laskuja" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "Valittu toimittaja myy tätä tuotetta vain %s" #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:156 @@ -134,10 +146,10 @@ msgstr "Tilauksen viite tulee olla yksilöllinen!" #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "" +msgstr "Keräilylistalta" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Ei hinnastoa!" @@ -188,7 +200,7 @@ msgstr "Oletushinnasto ostoille" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_current_purchases msgid "Current purchases" -msgstr "" +msgstr "Nykyiset hankinnat" #. module: purchase #: help:purchase.order,dest_address_id:0 @@ -229,7 +241,7 @@ msgid "Partial Picking" msgstr "Osittainen keräily" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Ostotilaus '%s' on vahvistettu." @@ -250,7 +262,7 @@ msgstr "Hyväksytty" #. module: purchase #: view:purchase.report:0 msgid "Reference UOM" -msgstr "" +msgstr "Viitemittayksikkö" #. module: purchase #: view:purchase.order:0 @@ -260,7 +272,7 @@ msgstr "Lähde" #. module: purchase #: field:purchase.report,product_uom:0 msgid "Reference UoM" -msgstr "" +msgstr "Viitemittayksikkö" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree @@ -276,12 +288,14 @@ msgid "Notes" msgstr "Huomautukset" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" "Please set one before choosing a product." msgstr "" +"Sinun pitää valita hinnasto tai toimittaja ostolomakkeella !\n" +"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen." #. module: purchase #: selection:purchase.report,month:0 @@ -322,7 +336,7 @@ msgstr "Summa netto:" #. module: purchase #: view:purchase.installer:0 msgid "Configure Your Purchases Management Application" -msgstr "" +msgstr "Konfiguroi ostonhallintajärjestelmäsi" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product @@ -341,6 +355,8 @@ msgid "" "A Pick list generates an invoice. Depending on the Invoicing control of the " "sale order, the invoice is based on delivered or on ordered quantities." msgstr "" +"Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku " +"perustuu joko toimitettuun tai tilattuun määrään" #. module: purchase #: selection:purchase.order,state:0 @@ -350,10 +366,10 @@ msgid "Cancelled" msgstr "Peruttu" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" -msgstr "" +msgstr "Ostomäärä ylittää rajan" #. module: purchase #: view:purchase.order:0 @@ -404,7 +420,7 @@ msgid "Reference" msgstr "Viite" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Ostotilausta jonka tila on %s ei voi poistaa." @@ -412,7 +428,7 @@ msgstr "Ostotilausta jonka tila on %s ei voi poistaa." #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "" +msgstr "Kohdeosoitteen yhteyshenkilö" #. module: purchase #: model:ir.model,name:purchase.model_stock_move @@ -426,7 +442,7 @@ msgid "Day" msgstr "Päivä" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Ostotilaus '%s' on asetettu vedokseksi." @@ -443,8 +459,8 @@ msgid "# of Lines" msgstr "Rivien lukumäärä" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -453,7 +469,7 @@ msgstr "Varoitus" #. module: purchase #: field:purchase.installer,purchase_analytic_plans:0 msgid "Purchase Analytic Plans" -msgstr "" +msgstr "Oston analyyttiset suunnitelmat" #. module: purchase #: model:ir.model,name:purchase.model_purchase_installer @@ -478,10 +494,10 @@ msgstr "Tilausrivi" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "Merkitsee että keräilylista on tehty" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Väärä tuotteen mittayksikkö!" @@ -528,7 +544,7 @@ msgstr "Toimittajan Viite" #. module: purchase #: help:purchase.order,amount_tax:0 msgid "The tax amount" -msgstr "" +msgstr "Veron määrä" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -537,6 +553,8 @@ msgid "" "of the purchase order, the invoice is based on received or on ordered " "quantities." msgstr "" +"Keräilysilta luo toimittajalaskun. Riippuen ostotilauksen kontrolleista, " +"lasku perustuu joko vastaanotettuun tai tilattuun määrään" #. module: purchase #: view:purchase.order:0 @@ -553,6 +571,8 @@ msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." msgstr "" +"Vastaantottoanalyysi mahdollistaa sinun tarkistaa ja analysoida helposti " +"yrityksesi tavaranvastaanoton ja toimittajiesi toimituskyvyn." #. module: purchase #: report:purchase.quotation:0 @@ -581,7 +601,7 @@ msgid "Order Lines" msgstr "Tilausrivit" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Ei kumppania!" @@ -611,7 +631,7 @@ msgstr "Hinnastot" #. module: purchase #: field:purchase.report,partner_address_id:0 msgid "Address Contact Name" -msgstr "" +msgstr "Osoitekontaktin nimi" #. module: purchase #: help:purchase.order,invoice_method:0 @@ -623,16 +643,21 @@ msgid "" "Manual: allows you to generate suppliers invoices by chosing in the " "uninvoiced lines of all manual purchase orders." msgstr "" +"Tilaukselta: luonnoslasku luodaan ostotilauksen perusteella. Kirjanpitäjän " +"pitä vain tarkistaa ja hyväksyä lasku.\n" +"Keräilystä: luonnoslasku luodaan tarkastetun vastaanoton perusteella.\n" +"Käsin (manuaalinen): mahdollistaa toimittajalaskujen luonnin käsin " +"laskuttamattomilta riveiltä kaikista manuaalisista ostotilauksisa." #. module: purchase #: help:purchase.order,invoice_ids:0 msgid "Invoices generated for a purchase order" -msgstr "" +msgstr "Ostotilaukselle luodut laskut" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -646,12 +671,12 @@ msgstr "Yleiset tiedot" #. module: purchase #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Oma työpöytä" #. module: purchase #: report:purchase.order:0 msgid "Purchase Order Confirmation N°" -msgstr "" +msgstr "Ostotilauksen vahvistuksen numero" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all @@ -660,6 +685,9 @@ msgid "" "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your suppliers, etc." msgstr "" +"ostoanalyysi mahdollistaa helpon tarkastelun yrityksesi ostohistoriasta ja " +"tehokkuukdesta. Tästä valikosta voit seurata neuvottelujen onnistumista, " +"toimittajien toimituskykyä yms." #. module: purchase #: view:purchase.order:0 @@ -673,6 +701,9 @@ msgid "" "order is 'On picking'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"Lasku on luotu automaattisesti, jos laskukontrolli ostotilauksessa on " +"'keräilystä'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta " +"(laskukontrolli=manuaalinen)" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -690,7 +721,7 @@ msgid "Reservation Destination" msgstr "Varausmääränpää" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Virheellinen toiminto!" @@ -727,7 +758,7 @@ msgstr "Yhteensä" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking msgid "Receptions" -msgstr "" +msgstr "Vastaanotot" #. module: purchase #: field:purchase.order,validator:0 @@ -743,6 +774,10 @@ msgid "" "according to your settings. Once you receive a supplier invoice, you can " "match it with the draft invoice and validate it." msgstr "" +"Käytä tätä valikkoa kontrolloidaksesi laskuja joita saapuu toimittajiltasi. " +"OpeneERP luo esilaskut jotka perustuvat ostotilauksiin tai vastaanottoihin, " +"asetusten mukaisesti. Kun vastaanotat toimittajan laskun, voit kohdistaa ja " +"täsmäyttää sen luonnoslakusn kanssa." #. module: purchase #: model:process.node,name:purchase.process_node_draftpurchaseorder0 @@ -753,7 +788,7 @@ msgstr "Tarjouspyyntö" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice msgid "Supplier Invoices to Receive" -msgstr "" +msgstr "Vastaanotettavat toimittajien laskut" #. module: purchase #: help:purchase.installer,purchase_requisition:0 @@ -761,6 +796,8 @@ msgid "" "Manages your Purchase Requisition and allows you to easily keep track and " "manage all your purchase orders." msgstr "" +"Hallinnoi ostotilauspyyntöjä ja mahdollistaa helpon ostotilausten seurannan " +"ja hallinnoinnin" #. module: purchase #: view:purchase.report:0 @@ -768,10 +805,11 @@ msgid " Month-1 " msgstr " Kuukausi-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" +"Tälle yritykselle ei ole määritelty ostojen päiväkirjaa: \"%s\" (id:%d)" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -779,10 +817,12 @@ msgid "Manual" msgstr "Manuaalinen" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" +"Sinun pitää ensin peruuttaa kaikki keräilyt jotka liittyvät tähän " +"ostotilaukseen" #. module: purchase #: view:purchase.order:0 @@ -794,12 +834,12 @@ msgstr "Tilauksen päivämäärä" #. module: purchase #: model:process.node,note:purchase.process_node_productrecept0 msgid "Incoming products to control" -msgstr "" +msgstr "Hallittavat sisääntulevat tuotteet" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 msgid "Approbation" -msgstr "" +msgstr "Hyväksyntä" #. module: purchase #: view:purchase.report:0 @@ -814,6 +854,10 @@ msgid "" "supplier invoice yet. Once you are ready to receive a supplier invoice, you " "can generate a draft supplier invoice based on the lines from this menu." msgstr "" +"Jos asetat ostotilauksen laskukontrollin tilaan manuaalinen, voit seurata " +"täällä kaikkia ostotilausrivejä joista et ole vielä vastaanottanut " +"toimittajan laskua. Kun olet valmis vastaanottamaan toimittajan laskun, voit " +"luoda luonnostilassa olevan toimittajalaskun tämän valikon rivien pohjalta." #. module: purchase #: model:process.node,name:purchase.process_node_invoiceafterpacking0 @@ -824,7 +868,7 @@ msgstr "Luonnoslasku" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 msgid "Manages analytic distribution and purchase orders." -msgstr "" +msgstr "Hallinnoi analyyttista jakelua ja ostotilauksia" #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -843,7 +887,7 @@ msgstr "Elokuu" #. module: purchase #: field:purchase.installer,purchase_requisition:0 msgid "Purchase Requisition" -msgstr "" +msgstr "Ostotilaus pyyntö" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action @@ -854,7 +898,7 @@ msgstr "Mittayksikköjen kategoriat" #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "Toimitusaika (päivää)" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move @@ -895,10 +939,9 @@ msgid "Month" msgstr "Kuukausi" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" -msgstr "" +msgstr "Odottaa toimittajan vahvistusta" #. module: purchase #: report:purchase.quotation:0 @@ -925,7 +968,7 @@ msgstr "Vastaanotettu" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "Luettelo tilatuista tuotteista" #. module: purchase #: help:purchase.order,picking_ids:0 @@ -943,12 +986,18 @@ msgstr "Ostojen hallinta" #: model:process.node,note:purchase.process_node_invoiceafterpacking0 #: model:process.node,note:purchase.process_node_invoicecontrol0 msgid "To be reviewed by the accountant." -msgstr "" +msgstr "Kirjanpitäjän tarkistettavaksi" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1020,7 +1069,7 @@ msgstr "Terveisin," #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier #: view:purchase.report:0 msgid "Negotiation by Supplier" -msgstr "" +msgstr "Toimittajaneuvottelut" #. module: purchase #: view:res.partner:0 @@ -1034,6 +1083,9 @@ msgid "" "the buyer. Depending on the Invoicing control of the purchase order, the " "invoice is based on received or on ordered quantities." msgstr "" +"Ostotilaus luo toimittajalaskun heti kun se on vahvistettu ostajan toimesta. " +"Riippuen laskujen kontrollista ostotilauksella, lasku perustuu " +"vastaanotettuihin tai tilattuihin määriin." #. module: purchase #: field:purchase.order,amount_untaxed:0 @@ -1043,12 +1095,12 @@ msgstr "Veroton summa" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "Merkitsee että lasku on maksettu" #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 msgid "Outgoing products to invoice" -msgstr "" +msgstr "Laskutettavat lähtevät tuotteet" #. module: purchase #: view:purchase.installer:0 @@ -1069,7 +1121,7 @@ msgstr "Erä ei ole samaa tuotetta" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "" +msgstr "Tämän dokumentin luontipäivämäärä" #. module: purchase #: view:res.partner:0 @@ -1092,11 +1144,11 @@ msgid "Manual Invoices" msgstr "Käsin Laskutus" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" -msgstr "" +msgstr "Joku on juuri vahvistanut oston jonka määrä ylittää rajan" #. module: purchase #: selection:purchase.report,month:0 @@ -1109,14 +1161,14 @@ msgid "Extended Filters..." msgstr "Laajennetut Suotimet..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut." @@ -1125,17 +1177,17 @@ msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut." #: code:addons/purchase/wizard/purchase_order_group.py:48 #, python-format msgid "Please select multiple order to merge in the list view." -msgstr "" +msgstr "Valitse useampia tilauksia niiden yhdistämiseksi listanäkymässä" #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 msgid "Pick list generated" -msgstr "" +msgstr "Keräilylista luotu" #. module: purchase #: view:purchase.order:0 msgid "Exception" -msgstr "" +msgstr "Poikkeus" #. module: purchase #: selection:purchase.report,month:0 @@ -1163,12 +1215,14 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " "less." msgstr "" +"Valitulla toimittajalla on asetettu minimitilausmäärä %s, et voi tilata " +"vähempää." #. module: purchase #: selection:purchase.report,month:0 @@ -1193,7 +1247,7 @@ msgstr "Tälle tuotteelle pitää määrittää valmistuserä" #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 msgid "A pick list is generated to track the incoming products." -msgstr "" +msgstr "Keräilylista on luotu saapuvien tavaroiden seuraamiseksi" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard @@ -1204,7 +1258,7 @@ msgstr "Työpöytä" #: view:purchase.report:0 #: field:purchase.report,price_standard:0 msgid "Products Value" -msgstr "" +msgstr "Tuotteiden arvo" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type @@ -1237,7 +1291,7 @@ msgstr "Tuotteet Kategorioittain" #: view:purchase.report:0 #: field:purchase.report,delay:0 msgid "Days to Validate" -msgstr "" +msgstr "Vahvistettavat päivät" #. module: purchase #: help:purchase.order,origin:0 @@ -1275,7 +1329,7 @@ msgstr "Tarjouspyynnöt" #. module: purchase #: help:purchase.order,date_approve:0 msgid "Date on which purchase order has been approved" -msgstr "" +msgstr "Päivä jolloin ostotilaus on hyväksytty" #. module: purchase #: selection:purchase.order,state:0 @@ -1292,13 +1346,13 @@ msgstr "Oletus ostotilauksien hinnaston versio" #: view:purchase.installer:0 msgid "" "Extend your Purchases Management Application with additional functionalities." -msgstr "" +msgstr "Laajenna ostonhallintajärjestelmääsi lisätoiminnoilla." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_install_module #: view:purchase.installer:0 msgid "Purchases Application Configuration" -msgstr "" +msgstr "Oston ohjelmistojen konfiguraatio" #. module: purchase #: field:purchase.order,fiscal_position:0 @@ -1308,7 +1362,7 @@ msgstr "Talouskanta" #. module: purchase #: report:purchase.order:0 msgid "Request for Quotation N°" -msgstr "" +msgstr "Tarjouspyynnön numero" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 @@ -1339,7 +1393,7 @@ msgstr "Ostotilauksen Rivit" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 msgid "The supplier approves the Purchase Order." -msgstr "" +msgstr "Toimittaja hyväksyy ostotilauksen." #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -1362,7 +1416,7 @@ msgstr "Yhdistä tilaukset" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line_invoice msgid "Purchase Order Line Make Invoice" -msgstr "" +msgstr "Ostotilausrivi luo laskun" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 @@ -1402,7 +1456,7 @@ msgstr "Viittemme tilaukselle" #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Search Purchase Order" -msgstr "" +msgstr "Etsi ostotilaus" #. module: purchase #: field:purchase.order,warehouse_id:0 @@ -1429,7 +1483,7 @@ msgid "Date Approved" msgstr "Hyväksymispäivämäärä" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Tätä ostotilausta ei voida perua!" @@ -1487,7 +1541,7 @@ msgstr "Odotettu toimitusosoite:" #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po msgid "Receptions Analysis" -msgstr "" +msgstr "Vastaanottoanalyysi" #. module: purchase #: help:purchase.order,amount_untaxed:0 @@ -1501,6 +1555,9 @@ msgid "" "suppliers. You can track all your interactions with them through the History " "tab: emails, orders, meetings, etc." msgstr "" +"Hallinnoi toimittajatietoja ja pidä yllä hyvät suhteet toimittajiisi. Voit " +"seurata kaikkia yhteyksiä heiden kanssaan kohdasta Historia: sähköpostit, " +"tilauset, kokoukset jne." #. module: purchase #: view:purchase.order:0 @@ -1538,10 +1595,10 @@ msgstr "Varaus" #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph #: view:purchase.report:0 msgid "Total Qty and Amount by month" -msgstr "" +msgstr "Kokonaismäärä ja määrä kuukausittain" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Ostotilausta ei voida perua!" @@ -1552,6 +1609,8 @@ msgid "" "In case there is no supplier for this product, the buyer can fill the form " "manually and confirm it. The RFQ becomes a confirmed Purchase Order." msgstr "" +"Jos tuotteelle ei ole toimittajaa, ostaja voi täyttää lomakkeen käsin ja " +"vahvistaa sen. Tarjouspyynnöstä tulee vahvistettu ostotilaus." #. module: purchase #: selection:purchase.report,month:0 @@ -1586,7 +1645,7 @@ msgstr "Oletettu päivämäärä" #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state #: view:purchase.report:0 msgid "Total price by product by state" -msgstr "" +msgstr "Kokonaishinta tuotteittain ja tiloittain" #. module: purchase #: report:purchase.quotation:0 @@ -1644,7 +1703,7 @@ msgstr "Vuosi" #. module: purchase #: field:purchase.report,negociation:0 msgid "Purchase-Standard Price" -msgstr "" +msgstr "Oston standardihinta" #. module: purchase #: model:product.pricelist.type,name:purchase.pricelist_type_purchase @@ -1685,7 +1744,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Ostotilaus '%s' on peruttu." @@ -1730,7 +1789,7 @@ msgstr "ALV:" #. module: purchase #: help:purchase.order,amount_total:0 msgid "The total amount" -msgstr "" +msgstr "Kokonaismäärä" #. module: purchase #: selection:purchase.report,month:0 @@ -1749,6 +1808,9 @@ msgid "" "order is 'On order'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"Lasku luodaan automaattisesti jos laskujen kontrolli ostotilauksella on " +"'tilattaessa'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta " +"(laskujen kontrolli = manuaalinen)." #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 @@ -1762,7 +1824,7 @@ msgid "Partner" msgstr "Kumppani" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1803,6 +1865,8 @@ msgid "" "unique number of the purchase order,computed automatically when the purchase " "order is created" msgstr "" +"Uniikki numero ostotilauksella, laskettu automaattisesti kun ostotilaus " +"luodaan" #. module: purchase #: model:ir.actions.act_window,name:purchase.open_board_purchase @@ -1853,30 +1917,15 @@ msgstr "Hankintojen Työtila" #~ "The Object name must start with x_ and not contain any special character !" #~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!" - #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Huomioi että tilaukset yhdistetään vain jos ne ovat samalle kumppanille ja " -#~ "lähetetään samaan paikkaan, ja linjat yhdistetään vain jos ne ovat täysin " -#~ "samat lukuunottamatta määrää ja mittayksikköä." - #~ msgid "Invalid model name in the action definition." #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä." #~ msgid "Create invoice from product recept" #~ msgstr "Luo lasku tuote vastaanotettaessa" -#~ msgid "N°" -#~ msgstr "Nro" - #~ msgid "Purchase Orders in Progress" #~ msgstr "Ostotilaukset käsittelyssä" @@ -2013,8 +2062,14 @@ msgstr "Hankintojen Työtila" #~ msgid "Request For Quotations" #~ msgstr "Tarjouspyynnöt" +#~ msgid "From Picking" +#~ msgstr "Vastaanotossa" + #~ msgid "Confirmed Purchase" #~ msgstr "Vahvistettu ostotilaus" #~ msgid "Confirm Purchase order from Request for quotation" #~ msgstr "Vahvista ostotilaus tarjouspyynnöstä" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Ei laskutetut ostotilausrivit" diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po index 81b4e0d31b4..c7fbe495c64 100644 --- a/addons/purchase/i18n/fr.po +++ b/addons/purchase/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "au fournisseur. L'appel d'offre devient alors un ordre d'achat confirmé." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -46,7 +46,7 @@ msgid "Destination" msgstr "Destination" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -84,8 +84,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Sur marchandise reçue" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -129,7 +129,7 @@ msgstr "" "suivre les produits reçus et contrôler les factures du fournisseur." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "Le fournisseur sélectionné peut seulement vendre ce produit par %s" @@ -152,7 +152,7 @@ msgid "From a Pick list" msgstr "À la réception" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Pas de Liste de Prix !" @@ -246,7 +246,7 @@ msgid "Partial Picking" msgstr "Traitement partiel" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "L'ordre d'achat '%s' est confirmé." @@ -293,7 +293,7 @@ msgid "Notes" msgstr "Notes" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -373,7 +373,7 @@ msgid "Cancelled" msgstr "Annulé" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Montant d'achat supérieur à la limite" @@ -427,7 +427,7 @@ msgid "Reference" msgstr "Référence" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Impossible de supprimer des bons de commande dans l'état %s !" @@ -449,7 +449,7 @@ msgid "Day" msgstr "Jour" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "L'ordre d'achat '%s' a été passé au statut 'Brouillon'." @@ -466,8 +466,8 @@ msgid "# of Lines" msgstr "# de lignes" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -504,7 +504,7 @@ msgid "It indicates that a picking has been done" msgstr "Indique qu'une réception de marchandise a été effectuée." #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UdM Produit incorrecte !" @@ -610,7 +610,7 @@ msgid "Order Lines" msgstr "Lignes de la commande" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Pas de Partenaire !" @@ -665,9 +665,9 @@ msgid "Invoices generated for a purchase order" msgstr "Factures générées pour un bon de commande" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -732,7 +732,7 @@ msgid "Reservation Destination" msgstr "Destination de la réservation" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Action non valide !" @@ -817,7 +817,7 @@ msgid " Month-1 " msgstr " Mois -1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -830,7 +830,7 @@ msgid "Manual" msgstr "Manuel" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -952,7 +952,6 @@ msgid "Month" msgstr "Mois" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "En attente de confirmation du fournisseur" @@ -1007,8 +1006,14 @@ msgstr "À vérifier par le comptable." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Lignes d'achat non facturées" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1156,7 +1161,7 @@ msgid "Manual Invoices" msgstr "Factures manuelles" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1175,7 +1180,7 @@ msgid "Extended Filters..." msgstr "Filtres étendus..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1183,7 +1188,7 @@ msgstr "" "Il n'y a pas de compte de charge définit pour ce produit : \"%s\" (id. : %d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1243,7 +1248,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1514,7 +1519,7 @@ msgid "Date Approved" msgstr "Date approbation" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Impossible d'annuler cette commande d'achat !" @@ -1629,7 +1634,7 @@ msgid "Total Qty and Amount by month" msgstr "Quantité totale et montant total par mois" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Impossible d'annuler le bon de commande !" @@ -1796,7 +1801,7 @@ msgstr "" "bon de commande." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "L'ordre d'achat '%s' est annulé." @@ -1876,7 +1881,7 @@ msgid "Partner" msgstr "Partenaire" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1926,20 +1931,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Tableau de bord des achats" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "" -#~ "Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent" - -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Veuillez noter que les commandes ne seront fusionnées que si elles sont " -#~ "destinées au même partenaire et vont à la même zone de stockage, et que les " -#~ "lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf " -#~ "pour la quantité et l'unité" - #~ msgid "Purchase Orders in Progress" #~ msgstr "Ordres d'achat en cours" @@ -2144,17 +2135,11 @@ msgstr "Tableau de bord des achats" #~ msgid "Product recept invoice" #~ msgstr "Facture de Réception du Produit" -#~ msgid "Quotation" -#~ msgstr "Devis" - #~ msgid "Date" #~ msgstr "Date" -#~ msgid "In progress" -#~ msgstr "En cours" - -#~ msgid "To be Invoiced" -#~ msgstr "À facturer" +#~ msgid "From Picking" +#~ msgstr "Sur marchandise reçue" -#~ msgid "Product UoM" -#~ msgstr "UdM du produit" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Lignes d'achat non facturées" diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po index da36906d8c6..523c705095a 100644 --- a/addons/purchase/i18n/gl.po +++ b/addons/purchase/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,7 +70,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -221,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -268,7 +268,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -342,7 +342,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -396,7 +396,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -418,7 +418,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -435,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -573,7 +573,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -682,7 +682,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -760,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,7 +771,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -885,7 +885,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -938,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1082,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1104,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1153,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1413,7 +1418,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1525,7 +1530,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1669,7 +1674,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1746,7 +1751,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po index d45d76e5707..47dfe9843c5 100644 --- a/addons/purchase/i18n/hr.po +++ b/addons/purchase/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,35 +24,36 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "" +msgstr "Ne možete potvrditi narudžbu bez stavaka." #. module: purchase #: field:purchase.order,invoiced:0 msgid "Invoiced & Paid" -msgstr "" +msgstr "Fakturirano i plaćeno" #. module: purchase #: field:purchase.order,location_id:0 #: view:purchase.report:0 #: field:purchase.report,location_id:0 msgid "Destination" -msgstr "" +msgstr "Odredište" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" msgstr "" +"Zadana jedinica mjere mora biti u istoj kategoriji kao nabavna jedinica mjere" #. module: purchase #: help:purchase.report,date:0 msgid "Date on which this document has been created" -msgstr "" +msgstr "Datum izrade dokumenta" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -69,18 +70,18 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Nefakturirano" #. module: purchase #: field:purchase.order,dest_address_id:0 msgid "Destination Address" -msgstr "" +msgstr "Adresa odredišta" #. module: purchase #: report:purchase.order:0 @@ -111,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -157,7 +158,7 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,company_id:0 msgid "Company" -msgstr "" +msgstr "Tvrtka" #. module: purchase #: view:board.board:0 @@ -169,7 +170,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Set to Draft" -msgstr "" +msgstr "Postavi kao nacrt" #. module: purchase #: selection:purchase.order,state:0 @@ -220,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -267,7 +268,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -341,7 +342,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -395,7 +396,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -417,7 +418,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -434,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -472,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -498,7 +499,7 @@ msgstr "" #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 #: view:purchase.order.line_invoice:0 msgid "Confirm" -msgstr "" +msgstr "Potvrdi" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice @@ -572,7 +573,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -621,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -681,7 +682,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -759,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -770,7 +771,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -884,7 +885,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -937,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1081,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1098,14 +1104,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1152,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1311,7 +1317,7 @@ msgstr "" #: view:purchase.order.group:0 #: view:purchase.order.line_invoice:0 msgid "Cancel" -msgstr "" +msgstr "Odustani" #. module: purchase #: view:purchase.order:0 @@ -1412,7 +1418,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1524,7 +1530,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1668,7 +1674,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1745,7 +1751,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po index 3a29de80a79..7e84ab57e64 100644 --- a/addons/purchase/i18n/hu.po +++ b/addons/purchase/i18n/hu.po @@ -8,13 +8,14 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" "PO-Revision-Date: 2011-02-09 18:38+0000\n" -"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n" +"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " +"<openerp@novotrade.hu>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +27,7 @@ msgstr "" "szállítónak. Az ajánlatkérés egy megerősített szállítói megrendeléssé válik." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Nem erősíthet meg sorok nélküli szállítói megrendelést." @@ -44,7 +45,7 @@ msgid "Destination" msgstr "Célállomás" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -81,8 +82,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Bevételezés alapján" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -127,7 +128,7 @@ msgstr "" "a bejövő számlákat." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -150,7 +151,7 @@ msgid "From a Pick list" msgstr "Bevételezési lista alapján" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Nincs árlista !" @@ -240,7 +241,7 @@ msgid "Partial Picking" msgstr "Részleges bevételezés" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "'%s' szállítói megrendelés megerősítésre került." @@ -287,7 +288,7 @@ msgid "Notes" msgstr "Megjegyzések" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -366,7 +367,7 @@ msgid "Cancelled" msgstr "Érvénytelenített" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "A limitet meghaladó beszerzési összeg" @@ -420,7 +421,7 @@ msgid "Reference" msgstr "Hivatkozás" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "%s állapotban lévő szállítói megrendelés(eke)t nem lehet törölni!" @@ -442,7 +443,7 @@ msgid "Day" msgstr "Nap" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "'%s' szállítói megrendelés tervezet állapotba beállításra került." @@ -459,8 +460,8 @@ msgid "# of Lines" msgstr "Sorok száma" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -497,7 +498,7 @@ msgid "It indicates that a picking has been done" msgstr "Jelzi, hogy a bevételezést végrehajtották." #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Rossz termék ME!" @@ -603,7 +604,7 @@ msgid "Order Lines" msgstr "Megrendelés sorok" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Nincs partner!" @@ -658,9 +659,9 @@ msgid "Invoices generated for a purchase order" msgstr "A szállítói megrendelés alapján készített számlák" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -725,7 +726,7 @@ msgid "Reservation Destination" msgstr "Foglalás rendeltetési helye" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Érvénytelen művelet !" @@ -809,7 +810,7 @@ msgid " Month-1 " msgstr " Előző hónap " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "\"%s\" (kód: %d) vállalatra nem állítottak be bejövő számla naplót." @@ -820,7 +821,7 @@ msgid "Manual" msgstr "Kézi" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -942,7 +943,6 @@ msgid "Month" msgstr "Hónap" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Szállító visszaigazolására váró" @@ -995,8 +995,14 @@ msgstr "Ellenőrizendő a könyvelő által." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Nem számlázott beszerzés sorok" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1142,7 +1148,7 @@ msgid "Manual Invoices" msgstr "Kézi számlák" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1161,7 +1167,7 @@ msgid "Extended Filters..." msgstr "Kiterjesztett szűrők…" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1169,7 +1175,7 @@ msgstr "" "\"%s\" (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1229,7 +1235,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1500,7 +1506,7 @@ msgid "Date Approved" msgstr "Jóváhagyás dátuma" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Nem érvényteleníthető ez a szállítói megrendelés!" @@ -1612,7 +1618,7 @@ msgid "Total Qty and Amount by month" msgstr "Havi összes mennyiség és végösszeg" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Nem érvényteleníthető a szállítói megrendelés!" @@ -1779,7 +1785,7 @@ msgstr "" "érvényteleníti a megrendelést." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "'%s' szállítói megrendelés érvénytelenítésre került." @@ -1859,7 +1865,7 @@ msgid "Partner" msgstr "Partner" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -2091,11 +2097,8 @@ msgstr "Beszerzési vezérlőpult" #~ msgid "Approving Purchase Order" #~ msgstr "Beszerzési rendelés jóváhagyása" -#~ msgid "" -#~ "You have to select a partner in the purchase form !\n" -#~ "\"\n" -#~ "\"Please set one partner before choosing a product." -#~ msgstr "" -#~ "Önnek ki kell választania egy partnert a beszerzési űrlapon !\n" -#~ "\"\n" -#~ "\"Kérem adjon meg egy partnert mielőtt választ egy terméket." +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Nem számlázott beszerzés sorok" + +#~ msgid "From Picking" +#~ msgstr "Bevételezés alapján" diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po index a29bb44a3df..bfd0f679837 100644 --- a/addons/purchase/i18n/id.po +++ b/addons/purchase/i18n/id.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "pembelian yang telah dikonfirmasi." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -45,7 +45,7 @@ msgid "Destination" msgstr "Tujuan" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -83,8 +83,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Formulir Pengambilan" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -127,7 +127,7 @@ msgstr "" "diterima, dan mengkontrol faktur pemasok" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -150,7 +150,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Tidak ada daftar harga !" @@ -241,7 +241,7 @@ msgid "Partial Picking" msgstr "Pengambilan Sebagian" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Order Pembelian '%s' telah dikonfirmasi" @@ -288,7 +288,7 @@ msgid "Notes" msgstr "Catatan" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -367,7 +367,7 @@ msgid "Cancelled" msgstr "Dibatalkan" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -421,7 +421,7 @@ msgid "Reference" msgstr "Referensi" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Tidak dapat menghapus Purchase Order yang berada di bagian %s" @@ -443,7 +443,7 @@ msgid "Day" msgstr "Hari" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "'% s' Order pembelian telah diatur di bagian draft." @@ -460,8 +460,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -498,7 +498,7 @@ msgid "It indicates that a picking has been done" msgstr "Hal ini menunjukkan bahwa pengambilan telah dilakukan" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Produk UoM Salah !" @@ -603,7 +603,7 @@ msgid "Order Lines" msgstr "Daftar Order" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Rekanan Tidak ada" @@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order" msgstr "Faktur dibuat untuk pesanan pembelian" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -718,7 +718,7 @@ msgid "Reservation Destination" msgstr "Reservasi Tujuan" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Tindakan tidak valid !" @@ -802,7 +802,7 @@ msgid " Month-1 " msgstr " Bulan - 1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -814,7 +814,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -932,7 +932,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -987,8 +986,14 @@ msgstr "Untuk di review oleh akuntan" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Daftar pembelian tidak difakturkan" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1135,7 +1140,7 @@ msgid "Manual Invoices" msgstr "Faktur secara manual" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1154,7 +1159,7 @@ msgid "Extended Filters..." msgstr "Filter Tambahan" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1162,7 +1167,7 @@ msgstr "" "Tidak ada account beban yang ditetapkan untuk produk ini \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1211,7 +1216,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1479,7 +1484,7 @@ msgid "Date Approved" msgstr "Tanggal Disetujui" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Order Pembelian tidak dapat dibatalkan" @@ -1594,7 +1599,7 @@ msgid "Total Qty and Amount by month" msgstr "Total Qty dan Jumlah berdasarkan bulan" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Order Pembelian tidak dapat dibatalkan !" @@ -1741,7 +1746,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Order Pembelian '%s' dibatalkan." @@ -1818,7 +1823,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1865,3 +1870,9 @@ msgstr "" #: model:ir.ui.menu,name:purchase.menu_board_purchase msgid "Purchase Dashboard" msgstr "" + +#~ msgid "From Picking" +#~ msgstr "Formulir Pengambilan" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Daftar pembelian tidak difakturkan" diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po index 8224d1280a3..bd23cef86d6 100644 --- a/addons/purchase/i18n/it.po +++ b/addons/purchase/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "fornitore. Il preventivo diverrà quindi un ordine di acquisto" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -46,7 +46,7 @@ msgid "Destination" msgstr "Destinazione" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -75,8 +75,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Da Prelievo" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -117,7 +117,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "Il fornitore selezionato vende questo prodotto solo da %s" @@ -140,7 +140,7 @@ msgid "From a Pick list" msgstr "Da una lista di prelievo" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Nessun Listino Prezzi !" @@ -233,7 +233,7 @@ msgid "Partial Picking" msgstr "Prelievo parziale" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "L'ordine di acquisto '%s' è confermato." @@ -280,7 +280,7 @@ msgid "Notes" msgstr "Note" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -360,7 +360,7 @@ msgid "Cancelled" msgstr "Annullato" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Costo d' acquisto sopra il limite consentito" @@ -414,7 +414,7 @@ msgid "Reference" msgstr "Referenza" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -437,7 +437,7 @@ msgid "Day" msgstr "Giorno" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "L'ordine di acquisto '%s' è stato riportato allo stato bozza." @@ -454,8 +454,8 @@ msgid "# of Lines" msgstr "Numero di linee" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done" msgstr "Indica che è stato eseguito un movimento merci" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UOM del prodotto errata!" @@ -598,7 +598,7 @@ msgid "Order Lines" msgstr "Righe Ordine" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Nessun partner!" @@ -654,9 +654,9 @@ msgid "Invoices generated for a purchase order" msgstr "Fatture generate per un ordine di acquisto" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -721,7 +721,7 @@ msgid "Reservation Destination" msgstr "Destinazione Prenotata" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Azione non valida !" @@ -801,7 +801,7 @@ msgid " Month-1 " msgstr " Mese - 1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -814,7 +814,7 @@ msgid "Manual" msgstr "Manuale" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -932,7 +932,6 @@ msgid "Month" msgstr "Mese" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "In attesa della risposta del fornitore" @@ -985,8 +984,14 @@ msgstr "Da controllare dal responsabile contabilità" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Linee di acquisto non fatturate" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1134,7 +1139,7 @@ msgid "Manual Invoices" msgstr "Fatture manuali" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1153,7 +1158,7 @@ msgid "Extended Filters..." msgstr "Filtri estesi" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1161,7 +1166,7 @@ msgstr "" "Non risulta presente alcun conto definito per questo prodotto:\"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1222,7 +1227,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1495,7 +1500,7 @@ msgid "Date Approved" msgstr "Data Approvazione" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Non è possibile cancellare questo ordine di acquisto!" @@ -1608,7 +1613,7 @@ msgid "Total Qty and Amount by month" msgstr "Q.tà totale e costo totale per mese" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "L'ordine di acquisto non può essere cancellato !" @@ -1775,7 +1780,7 @@ msgstr "" "l'utente cancella l'ordine di acquisto" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "L'ordine di acquisto '%s' è cancellato." @@ -1855,7 +1860,7 @@ msgid "Partner" msgstr "Partner" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1905,19 +1910,8 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Dashboard acquisti" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "" -#~ "Non puoi avere due versioni dello stesso listino che si sovrappongono" - -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Attenzione: gli ordini verranno fusi esclusivamente se sono rivolti al " -#~ "medesimo fornitore e destinati allo stesso punto di stoccaggio. Le righe " -#~ "verranno unite esclusivamente nel caso in cui risultassero identiche, ad " -#~ "eccezione di quantità e unità di misura." +#~ msgid "From Picking" +#~ msgstr "Da Prelievo" #~ msgid "Create invoice from product recept" #~ msgstr "Creare fattura da ricezione prodotti" @@ -2077,63 +2071,5 @@ msgstr "Dashboard acquisti" #~ msgid "Purchase Order lines" #~ msgstr "Righe Ordine Acquisto" -#~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." -#~ msgstr "" -#~ "Se si imposta il controllo della fatturazione su un ordine di acquisto come " -#~ "\"Manuale\", è possibile tener traccia qui delle linee degli ordini di " -#~ "acquisto per cui non si è ancora ricevuta la fattura del fornitore. Una " -#~ "volta che la fattura del fornitore è pervenuta è possibile, da questo menu, " -#~ "generare una fattura fornitore in formato bozza basata su queste linee." - -#~ msgid "To be Invoiced" -#~ msgstr "Da fatturare" - -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "Dal menu Ordini di Acquisto è possibile tracciare lo stato dei propri " -#~ "ordini: merci ricevute, fatture pervenute e controllate.\n" - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "È possibile utilizzare questo menu per controllare le fatture che devono " -#~ "essere ricevute dal fornitore. OpenERP pre-genera le fatture in stato bozza " -#~ "partendo dagli ordini di vendita o dalle ricezioni merci. Una volta ricevuta " -#~ "una fattura d'acquisto è possibile verificarne la congruenza con la fattura " -#~ "pre-generata in formato bozza e quindi validarla." - -#~ msgid "" -#~ "With the Requests for quotation menu you can create new request for " -#~ "quotations, review existing one and confirm them to order once the supplier " -#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a " -#~ "Purchase Order and generate the next steps: draft reception of the products, " -#~ "invoice to control." -#~ msgstr "" -#~ "Mediante il menu di richiesta preventivo è possibile creare nuovi " -#~ "preventivi, gestire quelli già presenti e confermarli, convertendoli quindi " -#~ "in ordini effettivi, non appena perviene l'approvazione da parte del " -#~ "fornitore. Quanto una richiesta di preventivo viene confermata, OpenERP si " -#~ "occuperà di convertirla in ordine di acquisto e di generare tutti i passi " -#~ "successivi necessari: ricezione dei prodotti da approvare, controllo delle " -#~ "fatturazioni." - -#~ msgid "" -#~ "Access your supplier records and maintain your relationship with them. You " -#~ "can track all your interactions with them through the history tab: emails, " -#~ "orders, meeting, etc." -#~ msgstr "" -#~ "Possibilità di accesso ai record dei propri fornitori e di gestione delle " -#~ "relazioni con essi. È possibili tenere traccia dei contatti intercorsi con i " -#~ "fornitori attraverso il tab storia: email, ordini, riunioni, etc." - -#~ msgid "Product UoM" -#~ msgstr "UoM del prodotto" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Linee di acquisto non fatturate" diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po index 8230d0ac38f..8125fef08b1 100644 --- a/addons/purchase/i18n/ko.po +++ b/addons/purchase/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "목적지" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,8 +70,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "피킹으로부터" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "가격리스트가 없음!" @@ -221,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -268,7 +268,7 @@ msgid "Notes" msgstr "노트" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -342,7 +342,7 @@ msgid "Cancelled" msgstr "취소됨" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -396,7 +396,7 @@ msgid "Reference" msgstr "참조" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -418,7 +418,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -435,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "잘못된 상품 UOM !" @@ -573,7 +573,7 @@ msgid "Order Lines" msgstr "주문 라인" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "파트너가 없음!" @@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -682,7 +682,7 @@ msgid "Reservation Destination" msgstr "예약 목적지" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "유효하지 않은 액션!" @@ -760,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,7 +771,7 @@ msgid "Manual" msgstr "매뉴얼" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -885,7 +885,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -938,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1082,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1104,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "이 상품을 위해 정의된 비용 계정이 없습니다: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "먼저 이 구매 주문에 첨부된 모든 인보이스를 취소해야 합니다." @@ -1153,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1416,7 +1421,7 @@ msgid "Date Approved" msgstr "승인된 날짜" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "이 구매 주문을 취소할 수 없습니다 !" @@ -1528,7 +1533,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "구매 주문을 취소할 수 없습니다 !" @@ -1672,7 +1677,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1749,7 +1754,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1801,13 +1806,8 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "컨트롤을 위한 접수 상에서 미리 생성된 공급자 인보이스" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "주문들은 동일한 파트너 및 동일한 위치를 향할 때만 합병될 수 있으며, 라인들은 수량과 유닛 외에는 정확히 동일할 경우에만 합쳐질 수 " -#~ "있습니다." +#~ msgid "From Picking" +#~ msgstr "피킹으로부터" #~ msgid "Purchase Process" #~ msgstr "구매 프로세스" @@ -1818,9 +1818,6 @@ msgstr "" #~ msgid "Create invoice from product recept" #~ msgstr "제품 수령으로부터 인보이스 생성" -#~ msgid "N°" -#~ msgstr "N°" - #~ msgid "Purchase Orders in Progress" #~ msgstr "진행 중인 구매 주문" @@ -1979,9 +1976,6 @@ msgstr "" #~ msgid "Purchase Invoice" #~ msgstr "구매 인보이스" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "중복되는 두 가격리스트 버전들은 허용되지 않습니다." - #~ msgid "From Packing list, Create invoice." #~ msgstr "포장 리스트로부터 인보이스 생성" diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po index f01fc3a7cfc..1b11c7c2f1b 100644 --- a/addons/purchase/i18n/lt.po +++ b/addons/purchase/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "Paskirties vieta" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,8 +69,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Iš važtaraščio" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Nėra kainoraščio!" @@ -224,7 +224,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -271,7 +271,7 @@ msgid "Notes" msgstr "Pastabos" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -345,7 +345,7 @@ msgid "Cancelled" msgstr "Nutrauktas" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -399,7 +399,7 @@ msgid "Reference" msgstr "Nuoroda" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -421,7 +421,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -438,8 +438,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Netinkamas produkto mato vnt.!" @@ -576,7 +576,7 @@ msgid "Order Lines" msgstr "Užsakymo eilutės" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Nėra partnerio!" @@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -685,7 +685,7 @@ msgid "Reservation Destination" msgstr "Rezervacijos vieta" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Netinkamas veiksmas!" @@ -763,7 +763,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -774,7 +774,7 @@ msgid "Manual" msgstr "Rankinis" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -888,7 +888,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -941,7 +940,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1085,7 +1090,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1102,14 +1107,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1158,7 +1163,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1418,7 +1423,7 @@ msgid "Date Approved" msgstr "Patvirtinimo data" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Negalima atšaukti šio pirkimo užsakymo!" @@ -1530,7 +1535,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Negalima atšaukti pirkimo užsakymo!" @@ -1674,7 +1679,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1751,7 +1756,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1799,9 +1804,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" -#~ msgid "N°" -#~ msgstr "N°" - #~ msgid "Purchase Orders in Progress" #~ msgstr "Vykdomi pirkimų užsakymai" @@ -1840,6 +1842,9 @@ msgstr "" #~ msgid "Invalid model name in the action definition." #~ msgstr "Netinkamas modelio pavadinimas veiksmo apibrėžime." +#~ msgid "From Picking" +#~ msgstr "Iš važtaraščio" + #~ msgid "Packing" #~ msgstr "Važtaraštis" diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po index b8a05efcba0..f5f249b7e1d 100644 --- a/addons/purchase/i18n/mn.po +++ b/addons/purchase/i18n/mn.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Хаана" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -71,8 +71,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Түүврээс" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -113,7 +113,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -136,7 +136,7 @@ msgid "From a Pick list" msgstr "Түүврийн жагсаалтаас" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Үнийн хүснэгтгүй !" @@ -228,7 +228,7 @@ msgid "Partial Picking" msgstr "Дутуу түүвэр" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Батлагдсан '%s' худалдан авалтын захиалга." @@ -275,7 +275,7 @@ msgid "Notes" msgstr "Тэмдэглэл" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -349,7 +349,7 @@ msgid "Cancelled" msgstr "Цуцалсан" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -403,7 +403,7 @@ msgid "Reference" msgstr "Дугаар" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "%s төлөвт байгаа захиалгыг устгах боломжгүй!" @@ -425,7 +425,7 @@ msgid "Day" msgstr "Өдөр" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -442,8 +442,8 @@ msgid "# of Lines" msgstr "# Мөрийн" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -480,7 +480,7 @@ msgid "It indicates that a picking has been done" msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -580,7 +580,7 @@ msgid "Order Lines" msgstr "Захиалгын мөрүүд" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Харилцагчгүй!" @@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -695,7 +695,7 @@ msgid "Reservation Destination" msgstr "Нөөц хүргэх хаяг" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Алдаатай үйлдэл !" @@ -773,7 +773,7 @@ msgid " Month-1 " msgstr " Сар-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -784,7 +784,7 @@ msgid "Manual" msgstr "Гараар" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -899,7 +899,6 @@ msgid "Month" msgstr "Сар" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -952,8 +951,14 @@ msgstr "Нягтлан бодогч дахин шалгана." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1096,7 +1101,7 @@ msgid "Manual Invoices" msgstr "Нэхэмжлэх заавар" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1113,14 +1118,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Энэ бараанд зарлагын данс алга:\"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1167,7 +1172,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1433,7 +1438,7 @@ msgid "Date Approved" msgstr "Зөвшөөрсөн огноо" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Энэ худалдан авалтын захиалгыг цуцалж чадсангүй !" @@ -1546,7 +1551,7 @@ msgid "Total Qty and Amount by month" msgstr "Нийт тоо ширхэг болон хэмжээ (сараар)" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Худалдан авалтын захиалга цуцалж чадсангүй!" @@ -1698,7 +1703,7 @@ msgstr "" "order." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Худалдан авалтын захиалга '%s' цуцлагдсан." @@ -1775,7 +1780,7 @@ msgid "Partner" msgstr "Харилцагч" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1883,6 +1888,9 @@ msgstr "Худалдан авалт" #~ msgid "Approved Purchase" #~ msgstr "Зөвшөөрөгдсөн худалдан авалт" +#~ msgid "From Picking" +#~ msgstr "Түүврээс" + #~ msgid "Invoice from Packing list" #~ msgstr "Савласан баримт дээр үндэслэж нэхэмжлэх" @@ -1988,15 +1996,6 @@ msgstr "Худалдан авалт" #~ msgid "Product Receipt" #~ msgstr "Барааны баримт" -#~ msgid "Waiting Schedule" -#~ msgstr "Хүлээх төлөвлөгөө" - -#~ msgid "In progress" -#~ msgstr "Үргэлжилж байна" - -#~ msgid "Manual in progress" -#~ msgstr "Гарын авлага үргэлжилж байна" - #~ msgid "Control invoices on receptions" #~ msgstr "Ирэх нэхэмжлэлийг удирдах" @@ -2009,54 +2008,14 @@ msgstr "Худалдан авалт" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Хүлээн авалт дээр нийлүүлэгчийн нэхэмжлэл үүснэ" -#~ msgid "Extended filters..." -#~ msgstr "Өргөтгөсөн шүүлтүүр..." - -#~ msgid "" -#~ "From Order: a draft invoice will be pre-generated based on the purchase " -#~ "order. The accountant will just have to validate this invoice for control.\n" -#~ "From Picking: a draft invoice will be pre-generated based on validated " -#~ "receptions.\n" -#~ "Manual: no invoice will be pre-generated. The accountant will have to encode " -#~ "manually." -#~ msgstr "" -#~ "Захиалгаас: a draft invoice will be pre-generated based on the purchase " -#~ "order. The accountant will just have to validate this invoice for control.\n" -#~ "Түүврээс: a draft invoice will be pre-generated based on validated " -#~ "receptions.\n" -#~ "Manual: no invoice will be pre-generated. The accountant will have to encode " -#~ "manually." - -#~ msgid "" -#~ "There is no expense account defined ' \\n " -#~ " 'for this product: \"%s\" (id:%d)" -#~ msgstr "" -#~ "Зардлын данс тодорхойлогдоогүй байна ' \\n " -#~ " 'энэ барааны \"%s\" (id:%d)" - -#~ msgid "To be Invoiced" -#~ msgstr "Нэхэмжлэнэ" - -#~ msgid "Нийлүүлэгчийн нэхэмжлэл хүлээж авах" -#~ msgstr "Нийлүүлэгчийн нэхэмжлэл хүлээж авах" - #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Дэлгэцийн архитектур алдаатай!" -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй." - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр" #~ msgid "When controlling invoice from orders" #~ msgstr "Захиалгаас нэхэмжлэл үүсгэх үед" #~ msgid "Purchase order is approved by supplier." #~ msgstr "Нийлүүлэгч захиалгыг зөвшөөрсөн." - -#~ msgid "Quotation" -#~ msgstr "Үнийн санал" - -#~ msgid "Product UoM" -#~ msgstr "Хэмжих нэгж" diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po index 0aab98ea9f8..7a74edaeba0 100644 --- a/addons/purchase/i18n/nb.po +++ b/addons/purchase/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "Destinasjon" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,8 +70,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Fra plukking" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "Fra en plukkliste" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Ingen prisliste!" @@ -223,7 +223,7 @@ msgid "Partial Picking" msgstr "Delvis plukking" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Innkjøpsordre '%s' er bekreftet." @@ -270,7 +270,7 @@ msgid "Notes" msgstr "Notater" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -344,7 +344,7 @@ msgid "Cancelled" msgstr "Annulert" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Innkjøpsbeløp er over grenseverdien" @@ -398,7 +398,7 @@ msgid "Reference" msgstr "Referanse" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -420,7 +420,7 @@ msgid "Day" msgstr "Dag" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -437,8 +437,8 @@ msgid "# of Lines" msgstr "# linjer" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -475,7 +475,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Feil måleenhet for produkt!" @@ -575,7 +575,7 @@ msgid "Order Lines" msgstr "Ordrelinjer" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Ingen klient definert!" @@ -629,9 +629,9 @@ msgid "Invoices generated for a purchase order" msgstr "Faktura generert for en innkjøpsordre" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -689,7 +689,7 @@ msgid "Reservation Destination" msgstr "Reservasjonsmål" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Ugyldig aksjon!" @@ -767,7 +767,7 @@ msgid " Month-1 " msgstr " Måned-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -779,7 +779,7 @@ msgid "Manual" msgstr "Manuell" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "Du må først avbryte all plukking relatert til denne innkjøpsordren." @@ -893,7 +893,6 @@ msgid "Month" msgstr "Måned" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -946,7 +945,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1090,7 +1095,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1107,7 +1112,7 @@ msgid "Extended Filters..." msgstr "Utvidede filter..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1115,7 +1120,7 @@ msgstr "" "Det er ikke definert noen kostnadskonto for dette produktet: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1163,7 +1168,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1423,7 +1428,7 @@ msgid "Date Approved" msgstr "Godkjent dato" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Kunne ikke annulere denne innkjøpsordren !" @@ -1535,7 +1540,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Kunne ikke annulere innkjøpsordre!" @@ -1679,7 +1684,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Innkjøpsordre '%s' er annulert." @@ -1756,7 +1761,7 @@ msgid "Partner" msgstr "Partner" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1802,6 +1807,9 @@ msgstr "unikt nummer på innkjøpsordren, generert automatisk ved opprettelse" msgid "Purchase Dashboard" msgstr "Innkjøpskonsoll" +#~ msgid "From Picking" +#~ msgstr "Fra plukking" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen." diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po index a27023a5832..189e6349460 100644 --- a/addons/purchase/i18n/nl.po +++ b/addons/purchase/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -27,7 +27,7 @@ msgstr "" "inkooporder." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "U kunt een inkooporder zonder orderregels niet bevestigen." @@ -45,7 +45,7 @@ msgid "Destination" msgstr "Bestemming" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -82,8 +82,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Van ontvangsten" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -127,7 +127,7 @@ msgstr "" "producten volgen en inkoopfacturen beheren." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s" @@ -150,7 +150,7 @@ msgid "From a Pick list" msgstr "van een piklijst" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Geen prijslijst!" @@ -243,7 +243,7 @@ msgid "Partial Picking" msgstr "Deels gepikt" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Inkooporder '%s' is bevestigd." @@ -290,7 +290,7 @@ msgid "Notes" msgstr "Notities" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -370,7 +370,7 @@ msgid "Cancelled" msgstr "Geannuleerd" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Inkoopbedrag boven de limiet" @@ -424,7 +424,7 @@ msgid "Reference" msgstr "Referentie" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Kan geen inkooporder(s) verwijderen die in status %s zijn !" @@ -446,7 +446,7 @@ msgid "Day" msgstr "Dag" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Inkooporder '%s' is in concept status gezet." @@ -463,8 +463,8 @@ msgid "# of Lines" msgstr "# Regels" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -501,7 +501,7 @@ msgid "It indicates that a picking has been done" msgstr "Het geeft aan dat een picking is uitgevoerd" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Verkeerde product meeteenheid !" @@ -606,7 +606,7 @@ msgid "Order Lines" msgstr "Orderregels" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Geen relatie geselecteerd!" @@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order" msgstr "Facturen voor een inkooporder gegenereerd" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -727,7 +727,7 @@ msgid "Reservation Destination" msgstr "Gereserveerde bestemming" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Foutieve handeling!" @@ -809,7 +809,7 @@ msgid " Month-1 " msgstr " Maand-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "Er is geen inkoopdagboek gedefinieerd in dit bedrijf: \"%s\" (id:%d)" @@ -820,7 +820,7 @@ msgid "Manual" msgstr "Handmatig" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -940,7 +940,6 @@ msgid "Month" msgstr "Maand" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Wacht lever. bevest." @@ -995,8 +994,14 @@ msgstr "Te controleren door de boekhouder." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Niet gefactureerde inkoopregels" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1143,7 +1148,7 @@ msgid "Manual Invoices" msgstr "Handmatige facturen" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1162,7 +1167,7 @@ msgid "Extended Filters..." msgstr "Uitgebreide filters..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1170,7 +1175,7 @@ msgstr "" "Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1228,7 +1233,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1496,7 +1501,7 @@ msgid "Date Approved" msgstr "Datum goedgekeurd" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Inkooporder kan niet geannuleerd worden." @@ -1611,7 +1616,7 @@ msgid "Total Qty and Amount by month" msgstr "Totaal aantal en bedrag per maand" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Inkooporder kan niet worden geannuleerd!" @@ -1779,7 +1784,7 @@ msgstr "" "inkooporder annuleert." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Inkooporder '%s' is geannuleerd." @@ -1859,7 +1864,7 @@ msgid "Partner" msgstr "Relatie" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1909,9 +1914,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Inkoop dashboard" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Twee overlappende prijslijsten is niet mogelijk!" - #~ msgid "Product recept invoice" #~ msgstr "Product-ontvangst factuur" @@ -1925,14 +1927,8 @@ msgstr "Inkoop dashboard" #~ msgstr "" #~ "Concept-inkoopfactuur aangemaakt om binnenkomende goederen te controleren." -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Alleen orders met dezelfde leverancier en met dezelfde bestemming worden " -#~ "samengevoegd. Tevens moeten de regels exact hetzelfde zijn (uitgezonderd " -#~ "aantallen)." +#~ msgid "From Picking" +#~ msgstr "Van ontvangsten" #~ msgid "Packing" #~ msgstr "Verpakking" @@ -1946,9 +1942,6 @@ msgstr "Inkoop dashboard" #~ msgid "Purchase Orders in Progress" #~ msgstr "Lopende inkooporders" -#~ msgid "N°" -#~ msgstr "Nr." - #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Inkooporder is goedgekeurd door de gebruiker." @@ -2124,3 +2117,6 @@ msgstr "Inkoop dashboard" #~ msgstr "" #~ "Er moeten een prijslijst worden geselecteerd in het inkoopformulier!\n" #~ "Selecteer een prijslijst voordat een product wordt gekozen." + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Niet gefactureerde inkoopregels" diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po index 59ae510f6bd..25f6526e97a 100644 --- a/addons/purchase/i18n/nl_BE.po +++ b/addons/purchase/i18n/nl_BE.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -220,7 +220,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -267,7 +267,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -341,7 +341,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -395,7 +395,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -417,7 +417,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -434,8 +434,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -572,7 +572,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -681,7 +681,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -759,7 +759,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -770,7 +770,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -884,7 +884,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -937,7 +936,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1081,7 +1086,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1098,14 +1103,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1152,7 +1157,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1412,7 +1417,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1524,7 +1529,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1668,7 +1673,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1745,7 +1750,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po index 4a0e499ab8d..7b56ee94c59 100644 --- a/addons/purchase/i18n/pl.po +++ b/addons/purchase/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "dostawcy. Zapytanie ofertowe stanie się potwierdzonym zamówieniem zakupu." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji." @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Przeznaczenie" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -79,8 +79,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Z pobrania" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -123,7 +123,7 @@ msgstr "" "itd. W zamówieniu zakupu możesz przeglądać produkty i sprawdzać stan faktur." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s" @@ -146,7 +146,7 @@ msgid "From a Pick list" msgstr "Z pobrania" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Brak cennika !" @@ -237,7 +237,7 @@ msgid "Partial Picking" msgstr "Pobranie częściowe" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Zamówienie zakupu '%s' zostało potwierdzone" @@ -284,7 +284,7 @@ msgid "Notes" msgstr "Uwagi" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -363,7 +363,7 @@ msgid "Cancelled" msgstr "Anulowano" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Wartość zakupu powyżej limitu" @@ -417,7 +417,7 @@ msgid "Reference" msgstr "Odnośnik" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Nie można usuwać zamówień zakupu, które są w stanie %s !" @@ -439,7 +439,7 @@ msgid "Day" msgstr "Dzień" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Zamówienie zakupu '%s' zostało ustawione w stan Projekt" @@ -456,8 +456,8 @@ msgid "# of Lines" msgstr "# pozycji" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -494,7 +494,7 @@ msgid "It indicates that a picking has been done" msgstr "To oznacza, że pobranie zostało wykonane" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Niepoprawna JM produktu !" @@ -598,7 +598,7 @@ msgid "Order Lines" msgstr "Pozycje zamówienia" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Brak partnera!" @@ -653,9 +653,9 @@ msgid "Invoices generated for a purchase order" msgstr "Faktury wygenerowane do zamówienia zakupu" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -718,7 +718,7 @@ msgid "Reservation Destination" msgstr "Miejsce docelowe rezerwacji" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Niedozwolona akcja !" @@ -801,7 +801,7 @@ msgid " Month-1 " msgstr " Miesiąc-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "Brak dziennika zakupów dla tej firmy: \"%s\" (id:%d)" @@ -812,7 +812,7 @@ msgid "Manual" msgstr "Ręczne" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -934,7 +934,6 @@ msgid "Month" msgstr "Miesiąc" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Oczekuje potwierdzenia dostawcy" @@ -987,8 +986,14 @@ msgstr "Do sprawdzenia przez księgowego." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Pozycje zakupów nie zafakturowane" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1135,7 +1140,7 @@ msgid "Manual Invoices" msgstr "Ręczne faktury" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1152,7 +1157,7 @@ msgid "Extended Filters..." msgstr "Rozszerzone filtry..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1160,7 +1165,7 @@ msgstr "" "Nie zdefiniowano konta rozchodowego dla tego produktu: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1217,7 +1222,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1487,7 +1492,7 @@ msgid "Date Approved" msgstr "Data aprobowania" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Nie można anulować tego zamówienia zakupu !" @@ -1602,7 +1607,7 @@ msgid "Total Qty and Amount by month" msgstr "Suma ilości i kwot wg miesięcu" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Nie można anulować zamówienia zakupu !" @@ -1766,7 +1771,7 @@ msgstr "" "* Stan 'Anulowano' jest ustawiany po anulowaniu zamówienia." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Zamówienia zakupu '%s' zostało anulowane." @@ -1846,7 +1851,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1967,9 +1972,6 @@ msgstr "Konsola zakupów" #~ msgid "After Purchase order , Create invoice." #~ msgstr "Po zamówieniu zakupu utwórz fakturę." -#~ msgid "N°" -#~ msgstr "Nr" - #~ msgid "Invoice based on deliveries" #~ msgstr "Faktura wg dostaw" @@ -1989,24 +1991,15 @@ msgstr "Konsola zakupów" #~ "Moduł do zarządzania zakupami\n" #~ " Zapytanie ofertowe, Tworzenie faktury zakupu, Druk zamówienia..." -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !" - #~ msgid "Approving Purchase Order" #~ msgstr "Aprobowanie zamówień sprzedaży" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Zamówienia będą łączone tylko wtedy, jeśli są do tego samego partnera i do " -#~ "tej samej strefy magazynowej, a pozycje będą łaczone tylko wtedy jeśli są " -#~ "takie same z wyjątkiem ilości i jednostki miary." - #~ msgid "Request For Quotations" #~ msgstr "Zapytania ofertowe" +#~ msgid "From Picking" +#~ msgstr "Z pobrania" + #~ msgid "" #~ "From Order: a draft invoice will be pre-generated based on the purchase " #~ "order. The accountant will just have to validate this invoice for control.\n" @@ -2094,18 +2087,6 @@ msgstr "Konsola zakupów" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Faktura dostawcy wygenerowana przy przyjęciu dla kontroli" -#~ msgid "Manual in progress" -#~ msgstr "Ręczne w toku" - -#~ msgid "Quotation" -#~ msgstr "Oferta" - -#~ msgid "In progress" -#~ msgstr "W toku" - -#~ msgid "Waiting Schedule" -#~ msgstr "Czeka na planowanie" - #~ msgid "Packing" #~ msgstr "Pobranie" @@ -2133,81 +2114,5 @@ msgstr "Konsola zakupów" #~ msgid "When purchase order is approved , it creates its packing list." #~ msgstr "Kiedy zamówienie zakupu jest zaaprobowane, to jest tworzone pobranie" -#~ msgid "To be Invoiced" -#~ msgstr "Do zafakturowania" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "ID certyfikatu modułu musi być unikalne !" - -#~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." -#~ msgstr "" -#~ "Jeśli ustawisz fakturowanie w zamówieniu zakupu jako \"Ręcznie\", to " -#~ "będziesz mógł wyszukiwać pozycje zamówień zakupu, dla których dostawca nie " -#~ "wystawił faktury. Jeśli się spodziewasz faktury od dostawcy, to możesz " -#~ "wygenerować projekt faktury od dostawcy na podstawie pozycji z tego menu." - -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Faktura wygenerowana dla zamówienia zakupu" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu." - -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "W menu Zamówienia zakupu możesz sprawdzać stany zamówień: przyjęcia " -#~ "produktów i zafakturowanie pozycji.\n" - -#~ msgid "The name of the group must be unique !" -#~ msgstr "Nazwa grupy musi być unikalna !" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "Nazwa modułu musi być unikalna !" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !" - -#~ msgid "Product UoM" -#~ msgstr "JM produktu" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !" - -#~ msgid "" -#~ "With the Requests for quotation menu you can create new request for " -#~ "quotations, review existing one and confirm them to order once the supplier " -#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a " -#~ "Purchase Order and generate the next steps: draft reception of the products, " -#~ "invoice to control." -#~ msgstr "" -#~ "W menu Zapytania ofertowe możesz tworzyć nowe zapytania ofertowe, przeglądać " -#~ "je i potwierdzać kiedy dostawca aprobuje zamówienie. Po potwierdzeniu " -#~ "zapytania OpenERP skonwertuje je do zamówienia zakupu i wygeneruje następne " -#~ "dokumenty: przyjęcie zewnętrzne i projekt faktury." - -#~ msgid "" -#~ "Access your supplier records and maintain your relationship with them. You " -#~ "can track all your interactions with them through the history tab: emails, " -#~ "orders, meeting, etc." -#~ msgstr "" -#~ "Dostęp do historii relacji z dostawcą. Możesz przeglądać: wiadomości, " -#~ "zamówienia, spotkania itp." - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "Stosuj to menu do sprawdzania faktur otrzymywanych od dostawców. OpenERP " -#~ "generuje projekty faktur na podstawie twoich zamówień zakupu lub przyjęć. " -#~ "Kiedy otrzymasz fakturę od dostawcy, to możesz ją skonfrontować z projektami " -#~ "faktur i zatwierdzić." +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Pozycje zakupów nie zafakturowane" diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po index 3ee9bcdcd49..058659c9e8e 100644 --- a/addons/purchase/i18n/pt.po +++ b/addons/purchase/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "fornecedor. A cotação torna-se numa ordem de compra confirmada." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Não pode confirmar uma ordem de compra sem linhas." @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -72,8 +72,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "A partir da receção" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -114,7 +114,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -137,7 +137,7 @@ msgid "From a Pick list" msgstr "A partir das receções" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Sem lista de preços" @@ -230,7 +230,7 @@ msgid "Partial Picking" msgstr "Receção parcial" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "A ordem de compra '%s' está confirmada." @@ -277,7 +277,7 @@ msgid "Notes" msgstr "Notas" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -353,7 +353,7 @@ msgid "Cancelled" msgstr "Cancelada" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Montante acima do limite" @@ -407,7 +407,7 @@ msgid "Reference" msgstr "Referência" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Não pode eliminar ordens de compra no estado %s!" @@ -429,7 +429,7 @@ msgid "Day" msgstr "Dia" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "A ordem de compra '%s' passou ao estado rascunho." @@ -446,8 +446,8 @@ msgid "# of Lines" msgstr "# de Linhas" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -484,7 +484,7 @@ msgid "It indicates that a picking has been done" msgstr "Indica que a receção foi feita" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UdM Errada!" @@ -586,7 +586,7 @@ msgid "Order Lines" msgstr "Lindas da ordem" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Sem parceiro!" @@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -695,7 +695,7 @@ msgid "Reservation Destination" msgstr "Destino da reserva" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Acção Inválida!" @@ -775,7 +775,7 @@ msgid " Month-1 " msgstr " Mês-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -787,7 +787,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -904,7 +904,6 @@ msgid "Month" msgstr "Mês" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Aguarda ação do fornecedor" @@ -957,8 +956,14 @@ msgstr "A ser revisto pelo contabilista" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Linhas de ordens de compra não faturadas" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1104,7 +1109,7 @@ msgid "Manual Invoices" msgstr "Faturação Manual" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1121,7 +1126,7 @@ msgid "Extended Filters..." msgstr "Filtros extendidos ..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1129,7 +1134,7 @@ msgstr "" "Não existe nenhuma conta de despesa definida para este artigo: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1178,7 +1183,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1444,7 +1449,7 @@ msgid "Date Approved" msgstr "Data de aprovação" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Não é possivel cancelar esta ordem de compra !" @@ -1556,7 +1561,7 @@ msgid "Total Qty and Amount by month" msgstr "Quantidades e valores por mês" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Não é possivel cancelar a ordem de compra !" @@ -1700,7 +1705,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "A ordem de compra '%s' foi cancelada." @@ -1777,7 +1782,7 @@ msgid "Partner" msgstr "Parceiro" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1825,9 +1830,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Você não pode ter duas versões da lista de preços que se sobrepõem!" - #~ msgid "Purchase Process" #~ msgstr "Processo de compra" @@ -1861,15 +1863,6 @@ msgstr "" #~ msgid "Approved Purchase" #~ msgstr "Compra aprovada" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Por favor note que as ordens só serão juntadas se forem do mesmo terceiro e " -#~ "estiverem a ir na mesma posição, e as linhas serão juntadas se forem " -#~ "exactamente os mesmos à excepção da quantidade e da unidade." - #~ msgid "Merge purchases" #~ msgstr "Juntar compras" @@ -2042,41 +2035,14 @@ msgstr "" #~ "Precisa primeiro cancelar todas as embalagens anexadas para esta ordem de " #~ "compra." -#~ msgid "To be Invoiced" -#~ msgstr "A ser facturado" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "O ID do certificado do módulo tem de ser único!" - #~ msgid "You cannot have 2 pricelist versions that overlap!" #~ msgstr "Não pode ter duas versões de listas de preços que se sobreponham." -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!" - #~ msgid "Invalid XML for View Architecture!" #~ msgstr "XML inválido para a arquitectura da vista!" -#~ msgid "" -#~ "From the Purchase Orders menu, you can track the status of your orders: " -#~ "products received, invoice received and controlled.\n" -#~ msgstr "" -#~ "A partir do menu 'Ordens de compra' pode seguir a situação das suas ordens: " -#~ "artigos recebidos; Fatura recebida e verificada.\n" - -#~ msgid "" -#~ "Use this menu to control the invoices to be received by your supplier. " -#~ "OpenERP pre-generates draft of invoices based on your purchase orders or " -#~ "your receptions. Once you receive a supplier invoice, you can control it " -#~ "according to the draft of invoice and validate it." -#~ msgstr "" -#~ "Use este menu para controlar as faturas recebidas dos fornecedores. O " -#~ "OpenERP gera faturas 'rascunho' com base nas ordens de compra ou nas " -#~ "recepções. Assim que receber uma fatura, pode verifica-la contra a a fatura " -#~ "rascunho e confirmá-la." - -#~ msgid "Product UoM" -#~ msgstr "UdM do artigo" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Linhas de ordens de compra não faturadas" -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Uma fatura gerada por ordem de compra" +#~ msgid "From Picking" +#~ msgstr "A partir da receção" diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index a1bc7e0c481..f951c832743 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -27,7 +27,7 @@ msgstr "" "se torna um Pedido de compra confirmado." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -46,7 +46,7 @@ msgid "Destination" msgstr "Local Destino" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -84,8 +84,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "From Picking" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -129,7 +129,7 @@ msgstr "" "controlar as faturas do fornecedor." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "O fornecedor selecionado somente vende este produto por %s" @@ -152,7 +152,7 @@ msgid "From a Pick list" msgstr "Da Lista de Separação" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Sem Lista de Preços !" @@ -245,7 +245,7 @@ msgid "Partial Picking" msgstr "Separação Parcial" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "O pedido de compra '%s' está confirmado." @@ -292,7 +292,7 @@ msgid "Notes" msgstr "Observações" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -372,7 +372,7 @@ msgid "Cancelled" msgstr "Cancelada" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Valor de compra acima do limite." @@ -426,7 +426,7 @@ msgid "Reference" msgstr "Referência" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Ordem(ns) de Compra com Status em %s não podem ser deletados" @@ -448,7 +448,7 @@ msgid "Day" msgstr "Dia" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "O Pedido de Compra '%s' foi colocado em Provisório." @@ -465,8 +465,8 @@ msgid "# of Lines" msgstr "# de Linhas" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -503,7 +503,7 @@ msgid "It indicates that a picking has been done" msgstr "Isso indica que a Separação foi Feita" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UdM do Produto errada !" @@ -609,7 +609,7 @@ msgid "Order Lines" msgstr "Linhas do Pedido" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Sem Parceiro!" @@ -664,9 +664,9 @@ msgid "Invoices generated for a purchase order" msgstr "Faturas geradas para um pedido de compra" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -731,7 +731,7 @@ msgid "Reservation Destination" msgstr "Reserva Destino" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Ação Inválida !" @@ -815,7 +815,7 @@ msgid " Month-1 " msgstr " Mês-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "Não há diário de compras definido para esta empresa: \"%s\" (id:%d)" @@ -826,7 +826,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -948,7 +948,6 @@ msgid "Month" msgstr "Mês" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Aguardando Confirmação do Fornecedor" @@ -1001,8 +1000,14 @@ msgstr "Aguardando revisão do contador." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Linhas não faturadas do Pedido de Compra" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1148,7 +1153,7 @@ msgid "Manual Invoices" msgstr "Faturamento Manual" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1165,7 +1170,7 @@ msgid "Extended Filters..." msgstr "Filtros Extendidos..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" @@ -1173,7 +1178,7 @@ msgstr "" "No existe conta de despesas definida para este produto: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1232,7 +1237,7 @@ msgstr "" " " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1505,7 +1510,7 @@ msgid "Date Approved" msgstr "Data da Aprovação" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Não é possível cancelar esta ordem de compra!" @@ -1620,7 +1625,7 @@ msgid "Total Qty and Amount by month" msgstr "Total Qtd e Valor por Mês" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Não foi possível cancelar o pedido de compra!" @@ -1785,7 +1790,7 @@ msgstr "" "* The 'Cancelled' state is set automatically when user cancel purchase order." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Pedido de compra '%s' está cancelado." @@ -1865,7 +1870,7 @@ msgid "Partner" msgstr "Parceiro" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1915,18 +1920,12 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Painel de Compras" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Você não pode ter 2 listas de preços que sobrepoem!" - #~ msgid "Confirm Purchase Order" #~ msgstr "Confirmar Ordem de Compra" #~ msgid "Order Ref" #~ msgstr "Ref. Pedido" -#~ msgid "N°" -#~ msgstr "Nº" - #, python-format #~ msgid "" #~ "You have to select a pricelist in the purchase form !\n" @@ -1984,15 +1983,6 @@ msgstr "Painel de Compras" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Fatura do fornecedor pré-gerada nos recebimentos para controle" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Por favor note que as ordens só serão agrupadas se forem do mesmo parceiro e " -#~ "estiverem indo para mesma localidade, e as linhas serão agrupadas se forem " -#~ "exatamente iguais, com exceção da quantidade e da unidade." - #~ msgid "Confirmed Purchase" #~ msgstr "Compra Confirmada" @@ -2044,98 +2034,12 @@ msgstr "Painel de Compras" #~ msgid "Invalid model name in the action definition." #~ msgstr "Nome do modelo inválido na definição da ação." -#~ msgid "Extended filters..." -#~ msgstr "Extended filters..." - -#~ msgid "To Invoice" -#~ msgstr "Para Faturar" - -#~ msgid "" -#~ "From Order: a draft invoice will be pre-generated based on the purchase " -#~ "order. The accountant will just have to validate this invoice for control.\n" -#~ "From Picking: a draft invoice will be pre-generated based on validated " -#~ "receptions.\n" -#~ "Manual: no invoice will be pre-generated. The accountant will have to encode " -#~ "manually." -#~ msgstr "" -#~ "From Order: a draft invoice will be pre-generated based on the purchase " -#~ "order. The accountant will just have to validate this invoice for control.\n" -#~ "From Picking: a draft invoice will be pre-generated based on validated " -#~ "receptions.\n" -#~ "Manual: no invoice will be pre-generated. The accountant will have to encode " -#~ "manually." - -#~ msgid "Quotation Request" -#~ msgstr "Requisição de Cotação" - -#~ msgid "This Year" -#~ msgstr "Este Ano" - -#~ msgid "Launch" -#~ msgstr "Executar" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ " Please note that:\n" -#~ "\n" -#~ " Orders will only be merged if: \n" -#~ " * Purchase Orders are in draft \n" -#~ " * Purchase Orders belong to the same supplier \n" -#~ " * Purchase Orders are have same stock location, same pricelist \n" -#~ "\n" -#~ " Lines will only be merged if: \n" -#~ " * Order lines are exactly the same except for the product,quantity and " -#~ "unit \n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ " Please note that:\n" -#~ "\n" -#~ " Orders will only be merged if: \n" -#~ " * Purchase Orders are in draft \n" -#~ " * Purchase Orders belong to the same supplier \n" -#~ " * Purchase Orders are have same stock location, same pricelist \n" -#~ "\n" -#~ " Lines will only be merged if: \n" -#~ " * Order lines are exactly the same except for the product,quantity and " -#~ "unit \n" -#~ "\n" - -#~ msgid "Total Quantity per product" -#~ msgstr "Total Quantity per product" - #~ msgid "You cannot have 2 pricelist versions that overlap!" #~ msgstr "You cannot have 2 pricelist versions that overlap!" -#~ msgid "Purchase Lines not Invoiced" -#~ msgstr "Linhas de Ordens de Compras não Faturadas" - -#~ msgid "# of Products" -#~ msgstr "# de Produtos" - #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Invalid XML for View Architecture!" -#~ msgid "Draft Purchases" -#~ msgstr "Compras em Rascunho" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "An invoice generated for a purchase order" - -#~ msgid "Purchase Profile : Install Extra Modules" -#~ msgstr "Purchase Profile : Install Extra Modules" - -#~ msgid "Inventory Control" -#~ msgstr "Controle de Inventário" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Erro ! Você não pode criar menu recursivo." - -#~ msgid "7 Days" -#~ msgstr "7 Dias" - #~ msgid "Delivery & Invoices" #~ msgstr "Entrega & Faturamento" @@ -2157,22 +2061,6 @@ msgstr "Painel de Compras" #~ msgid "Scheduled date" #~ msgstr "Data Prevista" -#~ msgid "" -#~ "Manages your Purchase Requisition and allow you to easily keep track and " -#~ "manage all your purchase orders." -#~ msgstr "" -#~ "Manages your Purchase Requisition and allow you to easily keep track and " -#~ "manage all your purchase orders." - -#~ msgid "Picking" -#~ msgstr "Separação" - -#~ msgid "This Month" -#~ msgstr "Este Mês" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "Rules are not supported for osv_memory objects !" - #~ msgid "Purchase Order lines" #~ msgstr "Linhas da Ordem de Compra" @@ -2239,23 +2127,11 @@ msgstr "Painel de Compras" #~ msgid "Purchase order is confirmed by the user." #~ msgstr "Ordem de compra confirmada pelo usuário." -#~ msgid "Manual in progress" -#~ msgstr "Em andamento manual" - -#~ msgid "Quotation" -#~ msgstr "Cotação" - -#~ msgid "In progress" -#~ msgstr "Em andamento" - -#~ msgid "Waiting Schedule" -#~ msgstr "Aguardando Programação" - #~ msgid "Date" #~ msgstr "Data" -#~ msgid "To be Invoiced" -#~ msgstr "A Faturar" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Linhas não faturadas do Pedido de Compra" -#~ msgid "Product UoM" -#~ msgstr "UdM do Produto" +#~ msgid "From Picking" +#~ msgstr "Do recebimento (separação)" diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 5798c30d7d5..b1c3b86aafb 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -56,7 +56,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -883,7 +883,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po index 2764bf2b51f..d81a7ab10d5 100644 --- a/addons/purchase/i18n/ro.po +++ b/addons/purchase/i18n/ro.po @@ -8,13 +8,13 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" "PO-Revision-Date: 2011-04-04 15:03+0000\n" -"Last-Translator: Mihai Boiciuc <Unknown>\n" +"Last-Translator: Mihai Satmarean <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "confirmat devine o comandă de aprovizionare." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Nu puteți confirma comanda de aprovizionare fără linii de comandă." @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Destinație" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -81,8 +81,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Din preluare" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -126,7 +126,7 @@ msgstr "" "urmări produsele recepționate și controla facturile primite de la furnizori." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -149,7 +149,7 @@ msgid "From a Pick list" msgstr "Dintr-o lista de preluare" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Fără listă de preţ!" @@ -243,7 +243,7 @@ msgid "Partial Picking" msgstr "Parțial preluat" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Comande de aprovizionare '%s' este confirmata." @@ -290,7 +290,7 @@ msgid "Notes" msgstr "Note" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -367,7 +367,7 @@ msgid "Cancelled" msgstr "Anulat" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -421,7 +421,7 @@ msgid "Reference" msgstr "Referință" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -444,7 +444,7 @@ msgid "Day" msgstr "Zi" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Comanda de aprovizionare '%s' a fost setata la starea de ciornă." @@ -461,8 +461,8 @@ msgid "# of Lines" msgstr "# de linii" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -499,7 +499,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "UM produs greșită!" @@ -605,7 +605,7 @@ msgid "Order Lines" msgstr "Poziţii comandă" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Fără partener!" @@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order" msgstr "Facturi generate dintr-o comandă de aprovizionare" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -721,7 +721,7 @@ msgid "Reservation Destination" msgstr "Destinaţie rezervare" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Acţiune invalidă!" @@ -804,7 +804,7 @@ msgid " Month-1 " msgstr " Luna-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -815,7 +815,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -931,7 +931,6 @@ msgid "Month" msgstr "Luna" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -985,8 +984,14 @@ msgstr "Spre a fi revizuită de contabil." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Linii de aprovizionat nefacturate" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1129,7 +1134,7 @@ msgid "Manual Invoices" msgstr "Facturare manuală" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1146,14 +1151,14 @@ msgid "Extended Filters..." msgstr "Filtre extinse..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1202,7 +1207,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1470,7 +1475,7 @@ msgid "Date Approved" msgstr "Dată aprobare" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Nu puteți anula această comandă de aprovizionare!" @@ -1582,7 +1587,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Nu puteți anula comanda de aprovizionare!" @@ -1726,7 +1731,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Comanda de aprovizionare '%s' este anulată." @@ -1806,7 +1811,7 @@ msgid "Partner" msgstr "Partener" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1861,3 +1866,9 @@ msgstr "Panou de bord aprovizionare" #~ msgid "Order Ref" #~ msgstr "Ref. Comanda" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Linii de aprovizionat nefacturate" + +#~ msgid "From Picking" +#~ msgstr "Din preluare" diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index fae04160f91..31e94600839 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -26,7 +26,7 @@ msgstr "" "становится подтвержденным заказом на закупку." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Вы не можете подтвердить заказ на закупку без позиций в заказе." @@ -44,7 +44,7 @@ msgid "Destination" msgstr "Место назначения" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -73,8 +73,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "Из прихода" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -118,10 +118,10 @@ msgstr "" "ТМЦ, и контролировать счета поставщиков." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "Выбранный поставщик продает ТМЦ только по %s" #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:156 @@ -141,7 +141,7 @@ msgid "From a Pick list" msgstr "Из комплектовочного листа" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Нет каталога !" @@ -234,7 +234,7 @@ msgid "Partial Picking" msgstr "Частичное комплектование" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Заказ на закупку '%s' подтвержден." @@ -281,7 +281,7 @@ msgid "Notes" msgstr "Примечания" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -360,7 +360,7 @@ msgid "Cancelled" msgstr "Отменено" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "Закупленное количество сверх лимита" @@ -414,7 +414,7 @@ msgid "Reference" msgstr "Ссылка" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Нельзя удалить Заказ(ы) на закупку в стадии %s !" @@ -436,7 +436,7 @@ msgid "Day" msgstr "День" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "Заказ на закупку '%s' был установлен в состояние \"Черновик\"." @@ -453,8 +453,8 @@ msgid "# of Lines" msgstr "Кол-во позиций" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -463,7 +463,7 @@ msgstr "Предупреждение" #. module: purchase #: field:purchase.installer,purchase_analytic_plans:0 msgid "Purchase Analytic Plans" -msgstr "" +msgstr "План счетов аналитики для закупок" #. module: purchase #: model:ir.model,name:purchase.model_purchase_installer @@ -491,7 +491,7 @@ msgid "It indicates that a picking has been done" msgstr "Показывает, что комплектование выполнено." #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Неверная ед. изм." @@ -596,7 +596,7 @@ msgid "Order Lines" msgstr "Позиции заказа" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Нет партнера!" @@ -645,9 +645,9 @@ msgid "Invoices generated for a purchase order" msgstr "Счета созданные для заказа на закупку" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -705,7 +705,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Неверное действие !" @@ -785,7 +785,7 @@ msgid " Month-1 " msgstr " Месяц-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "Журнал закупок не определен для этой компании: \"%s\" (id:%d)" @@ -796,7 +796,7 @@ msgid "Manual" msgstr "Вручную" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -843,7 +843,7 @@ msgstr "Черновик счета" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 msgid "Manages analytic distribution and purchase orders." -msgstr "" +msgstr "Управление разнесением аналитики и заказами на закупку." #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -914,7 +914,6 @@ msgid "Month" msgstr "Месяц" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "Ожидание" @@ -968,8 +967,14 @@ msgstr "Будет проверено бухгалтером." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" -msgstr "Закупаемые позиции без счетов" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" +msgstr "" #. module: purchase #: report:purchase.order:0 @@ -1112,7 +1117,7 @@ msgid "Manual Invoices" msgstr "Счета вручную" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1129,14 +1134,14 @@ msgid "Extended Filters..." msgstr "Расширенные фильтры..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1185,7 +1190,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1454,7 +1459,7 @@ msgid "Date Approved" msgstr "Дата утверждения" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Не удалось отменить этот заказ на закупку" @@ -1566,7 +1571,7 @@ msgid "Total Qty and Amount by month" msgstr "Общее кол-во и сумма по месяцу" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Не удалось отменить заказ на закупку !" @@ -1690,7 +1695,7 @@ msgstr "Утвердить" #. module: purchase #: view:purchase.order:0 msgid "To Approve" -msgstr "Утвердить" +msgstr "Одобрить" #. module: purchase #: view:purchase.order.line:0 @@ -1718,7 +1723,7 @@ msgstr "" "пользователем заказа на закупку." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "Заказ на закупку '%s' отменен." @@ -1798,7 +1803,7 @@ msgid "Partner" msgstr "Партнер" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1848,18 +1853,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "Панель закупок" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Невозможно использовать 2 перекрывающиеся версии каталогов!" - -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Учтите, что заказы могут быть объединены, только если они относятся к одному " -#~ "партнеру и местоположению, а позиции могут быть объединены, только если они " -#~ "абсолютно одинаковы, кроме количества." - #~ msgid "Purchase Orders in Progress" #~ msgstr "Выполняемые заказы на закупку" @@ -2015,14 +2008,8 @@ msgstr "Панель закупок" #~ msgstr "" #~ "Предварительно созданный счет поставщика для контроля основанного на заказе" -#~ msgid "Manual in progress" -#~ msgstr "Выполняется вручную" - -#~ msgid "In progress" -#~ msgstr "Выполняется" - -#~ msgid "Waiting Schedule" -#~ msgstr "Расписание ожидания" +#~ msgid "From Picking" +#~ msgstr "Из прихода" #, python-format #~ msgid "" @@ -2052,9 +2039,6 @@ msgstr "Панель закупок" #~ msgid "Request For Quotations" #~ msgstr "Запрос цен" -#~ msgid "Quotation" -#~ msgstr "Предложение (оферта)" - #~ msgid "" #~ "Module for purchase management\n" #~ " Request for quotation, Create Supplier Invoice, Print Order..." @@ -2068,44 +2052,5 @@ msgstr "Панель закупок" #~ msgid "Product Receipt" #~ msgstr "Получение ТМЦ" -#~ msgid "" -#~ "If you set the invoicing control on a purchase order as \"Manual\", you can " -#~ "track here all the purchase order lines for which you did not received the " -#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you " -#~ "can generate a draft supplier invoice based on the lines from this menu." -#~ msgstr "" -#~ "Если, при заказе на закупку, вы установили метод управления счетами " -#~ "\"Вручную\", то здесь вы можете отслеживать все позиции заказа на закупку на " -#~ "которые вы не получили счет от поставщика. При готовности получить счет от " -#~ "поставщика, вы можете создать черновик счета основанный на позициях заказа " -#~ "из этого меню." - -#~ msgid "To be Invoiced" -#~ msgstr "Счет будет выставлен" - -#~ msgid "Rule must have at least one checked access right !" -#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !" - -#~ msgid "An invoice generated for a purchase order" -#~ msgstr "Счет созданный для заказа на закупку" - -#~ msgid "The name of the group must be unique !" -#~ msgstr "Название группы должно быть уникальным !" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "Название модуля должно быть уникальным !" - -#~ msgid "Product UoM" -#~ msgstr "Ед. изм. ТМЦ" - -#~ msgid "Rules are not supported for osv_memory objects !" -#~ msgstr "Правила не поддерживаются в объектах osv_memory !" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Ошибка ! Нельзя создать зацикленные меню." - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "Размер поля никогда не может быть меньше 1 !" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Закупаемые позиции без счетов" diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po index 234f57e37dd..f8a52b51c0e 100644 --- a/addons/purchase/i18n/sk.po +++ b/addons/purchase/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "Nemôžete potvrdiť objednávku bez objednávky v zozname." @@ -43,7 +43,7 @@ msgid "Destination" msgstr "Cieľ" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -71,7 +71,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -113,7 +113,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "Vybraný dodávateľ predáva produkt %s" @@ -136,7 +136,7 @@ msgid "From a Pick list" msgstr "Vyberte zo zoznamu" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Žiadny cenník !" @@ -222,7 +222,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -269,7 +269,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -343,7 +343,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -397,7 +397,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -419,7 +419,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -436,8 +436,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -574,7 +574,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -683,7 +683,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -761,7 +761,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -772,7 +772,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -886,7 +886,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -939,7 +938,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1083,7 +1088,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1100,14 +1105,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1154,7 +1159,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1414,7 +1419,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1526,7 +1531,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1670,7 +1675,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1747,7 +1752,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po index 4c1e48e1ed5..7791e9a1ba3 100644 --- a/addons/purchase/i18n/sl.po +++ b/addons/purchase/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "Cilj" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "Ni cenika!" @@ -224,7 +224,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -271,7 +271,7 @@ msgid "Notes" msgstr "Opombe" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -345,7 +345,7 @@ msgid "Cancelled" msgstr "Preklicano" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -399,7 +399,7 @@ msgid "Reference" msgstr "Sklic" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -421,7 +421,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -438,8 +438,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -576,7 +576,7 @@ msgid "Order Lines" msgstr "Postavke naloga" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "Ni partnerja!" @@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -685,7 +685,7 @@ msgid "Reservation Destination" msgstr "Cilj rezervacije" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Nepravilno dejanje!" @@ -763,7 +763,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -774,7 +774,7 @@ msgid "Manual" msgstr "Ročno" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -888,7 +888,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -941,7 +940,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1085,7 +1090,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1102,14 +1107,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1156,7 +1161,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1422,7 +1427,7 @@ msgid "Date Approved" msgstr "Odobreno dne" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1534,7 +1539,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1678,7 +1683,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1755,7 +1760,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1801,18 +1806,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" -#~ msgid "You can not have 2 pricelist version that overlaps!" -#~ msgstr "Ne morete imeti 2 različic cenika, ki se prekrivata." - -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Prosim, vedite, da bodo nalogi združeni samo, če so namenjeni istemu " -#~ "partnerju in lokaciji. Postavke bodo združene samo, če so popolnoma enake, " -#~ "razen v količini in enoti." - #~ msgid "Purchase Orders in Progress" #~ msgstr "Nabavni nalogi v teku" @@ -1862,6 +1855,3 @@ msgstr "" #~ msgid "Packing" #~ msgstr "Pakiranje" - -#~ msgid "N°" -#~ msgstr "N°" diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po index 552885fe204..13ac85a5759 100644 --- a/addons/purchase/i18n/sq.po +++ b/addons/purchase/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,7 +70,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -221,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -268,7 +268,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -342,7 +342,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -396,7 +396,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -418,7 +418,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -435,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -573,7 +573,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -682,7 +682,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -760,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,7 +771,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -885,7 +885,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -938,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1082,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1104,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1153,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1413,7 +1418,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1525,7 +1530,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1669,7 +1674,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1746,7 +1751,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po index 7cce73a7d0b..b5161e838a0 100644 --- a/addons/purchase/i18n/sr.po +++ b/addons/purchase/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:52+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "Odredište" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,8 +70,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "IZ Izbora" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -227,7 +227,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -274,7 +274,7 @@ msgid "Notes" msgstr "Napomene" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -348,7 +348,7 @@ msgid "Cancelled" msgstr "Otkazano" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -402,7 +402,7 @@ msgid "Reference" msgstr "Referenca" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !" @@ -424,7 +424,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -441,8 +441,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -579,7 +579,7 @@ msgid "Order Lines" msgstr "Redovi naloga" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -688,7 +688,7 @@ msgid "Reservation Destination" msgstr "Odredište rezervacije" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -766,7 +766,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -777,7 +777,7 @@ msgid "Manual" msgstr "Ručno" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -893,7 +893,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -946,7 +945,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1090,7 +1095,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1107,14 +1112,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1161,7 +1166,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1428,7 +1433,7 @@ msgid "Date Approved" msgstr "Datum odobrenja" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1540,7 +1545,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1684,7 +1689,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1761,7 +1766,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1810,6 +1815,9 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Račun dobavljača pregenirisan prilikom prijema zbog kontrole" +#~ msgid "From Picking" +#~ msgstr "IZ Izbora" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Neispravan naziv modela u definiciji zadatka." @@ -1992,15 +2000,3 @@ msgstr "" #~ msgid "Request For Quotations" #~ msgstr "Zahtevi za ponudu" - -#~ msgid "Manual in progress" -#~ msgstr "Rucno uredjenje u toku" - -#~ msgid "Quotation" -#~ msgstr "Upit" - -#~ msgid "In progress" -#~ msgstr "U toku" - -#~ msgid "Waiting Schedule" -#~ msgstr "Cekanje Zakazanog" diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po index 1bde3e0e20a..55e0a79227f 100644 --- a/addons/purchase/i18n/sr@latin.po +++ b/addons/purchase/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "Odredište" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,8 +70,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "IZ Izbora" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -227,7 +227,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -274,7 +274,7 @@ msgid "Notes" msgstr "Napomene" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -348,7 +348,7 @@ msgid "Cancelled" msgstr "Otkazano" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -402,7 +402,7 @@ msgid "Reference" msgstr "Referenca" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !" @@ -424,7 +424,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -441,8 +441,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -579,7 +579,7 @@ msgid "Order Lines" msgstr "Redovi naloga" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -688,7 +688,7 @@ msgid "Reservation Destination" msgstr "Odredište rezervacije" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -766,7 +766,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -777,7 +777,7 @@ msgid "Manual" msgstr "Ručno" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -893,7 +893,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -946,7 +945,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1090,7 +1095,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1107,14 +1112,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1161,7 +1166,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1428,7 +1433,7 @@ msgid "Date Approved" msgstr "Datum odobrenja" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1540,7 +1545,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1684,7 +1689,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1761,7 +1766,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1807,6 +1812,9 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" +#~ msgid "From Picking" +#~ msgstr "IZ Izbora" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Neispravan naziv modela u definiciji zadatka." @@ -1992,15 +2000,3 @@ msgstr "" #~ msgid "Request For Quotations" #~ msgstr "Zahtevi za ponudu" - -#~ msgid "Manual in progress" -#~ msgstr "Rucno uredjenje u toku" - -#~ msgid "Quotation" -#~ msgstr "Upit" - -#~ msgid "In progress" -#~ msgstr "U toku" - -#~ msgid "Waiting Schedule" -#~ msgstr "Cekanje Zakazanog" diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po index cd5f0221776..c979270cb50 100644 --- a/addons/purchase/i18n/sv.po +++ b/addons/purchase/i18n/sv.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-12 17:11+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-08-03 23:22+0000\n" +"Last-Translator: Stefan Lind <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,10 +24,10 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "" +msgstr "Du kan inte bekräfta beställningen utan inköpsorder" #. module: purchase #: field:purchase.order,invoiced:0 @@ -42,7 +42,7 @@ msgid "Destination" msgstr "Destination" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -71,8 +71,8 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "From Picking" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -113,7 +113,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -136,7 +136,7 @@ msgid "From a Pick list" msgstr "Från plocklista" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "No Pricelist !" @@ -229,7 +229,7 @@ msgid "Partial Picking" msgstr "Delvis plockning" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "Inköpsorder '%s' är bekräftad." @@ -276,7 +276,7 @@ msgid "Notes" msgstr "Anteckningar" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -350,7 +350,7 @@ msgid "Cancelled" msgstr "Cancelled" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -404,7 +404,7 @@ msgid "Reference" msgstr "Reference" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "Kan inte radera order/ordrar som är i %s tillstånd!" @@ -426,7 +426,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -443,8 +443,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -481,7 +481,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "Wrong Product UOM !" @@ -581,7 +581,7 @@ msgid "Order Lines" msgstr "Order Lines" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "No Partner!" @@ -630,9 +630,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -690,7 +690,7 @@ msgid "Reservation Destination" msgstr "Reservation Destination" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Invalid action !" @@ -768,7 +768,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -779,7 +779,7 @@ msgid "Manual" msgstr "Manual" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -895,7 +895,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -949,7 +948,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1093,7 +1098,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1110,14 +1115,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "There is no expense account defined for this product: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "You must first cancel all invoices attached to this purchase order." @@ -1164,7 +1169,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1431,7 +1436,7 @@ msgid "Date Approved" msgstr "Datum godkänd" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "Could not cancel this purchase order !" @@ -1543,7 +1548,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "Could not cancel purchase order !" @@ -1687,7 +1692,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1764,7 +1769,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1820,6 +1825,9 @@ msgstr "" #~ msgid "Supplier Invoice pre-generated on receptions for control" #~ msgstr "Supplier Invoice pre-generated on receptions for control" +#~ msgid "From Picking" +#~ msgstr "From Picking" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Invalid model name in the action definition." diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po index 3a619354bbd..96044c7e7d1 100644 --- a/addons/purchase/i18n/th.po +++ b/addons/purchase/i18n/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -23,12 +23,14 @@ msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." msgstr "" +"ผู้ซื้อต้องอนุมัติใบแจ้งขอใบเสนอราคาก่อนที่จะส่งให้ผู้จัดจำหน่าย " +"จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "" +msgstr "คุณไม่สามารถยืนยันใบสั่งซื้อที่ไม่มีรายการสั่งซื้อได้" #. module: purchase #: field:purchase.order,invoiced:0 @@ -43,12 +45,12 @@ msgid "Destination" msgstr "ปลายทาง" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" -msgstr "" +msgstr "คุณต้องเลือกหน่วยของสินค้าที่อยู่ในประเภทเดียวกันกับหน่วยที่สั่งซื้อ" #. module: purchase #: help:purchase.report,date:0 @@ -67,10 +69,17 @@ msgid "" "supplier invoices: based on the order, based on the receptions or manual " "encoding." msgstr "" +"คุณสามารถสร้างใบแจ้งขอใบเสนอราคาได้จากใบสั่งซื้อที่สถานะยังไม่ยืนยัน " +"และใช้สำหรับตรวจสอบใบแจ้งขอใบเสนอราคาที่ระบบสร้างขึ้นอัตโนมัติจากกฎต่างๆ " +"เช่น จากกฎการสั่งซื้อ เป็นต้น; คุณสามารถเปลี่ยนจากใบแจ้งขอใบเสนอราคา " +"ให้เป็นใบสั่งซื้อสถานะยืนยันได้; " +"หากคุณใช้มุมมองแบบแสดงทั้งหมด(สามารถเลือกได้จากการตั้งค่าของแต่ละผู้ใช้งาน) " +"คุณจะสามารถเลือกรูปแบบการสร้างใบแจ้งหนี้โดย สร้างจากใบสั่งซื้อ, " +"สร้างจากใบรับสินค้า และสร้างเอง" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -96,12 +105,12 @@ msgstr "ตรวจสอบโดย" #: view:purchase.report:0 #: field:purchase.report,partner_id:0 msgid "Supplier" -msgstr "ผู้จำหน่าย" +msgstr "ผู้จัดจำหน่าย" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Do you want to generate the supplier invoices ?" -msgstr "" +msgstr "คุณต้องการสร้างใบแจ้งหนี้หรือไม่?" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action @@ -110,9 +119,12 @@ msgid "" "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." msgstr "" +"ใช้เมนูนี้เพื่อค้นหาใบสั่งซื้อจาก เลขที่, ผู้จัดจำหน่าย, สินค้า เป็นต้น; " +"คุณสามารถตรวจสอบสถานะใบสั่งซื้อได้ด้วยว่ารับสินค้ามาแล้วเท่าไหร่และแจ้งหนี้แล" +"้วเท่าใด" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -121,24 +133,24 @@ msgstr "" #: code:addons/purchase/wizard/purchase_line_invoice.py:156 #, python-format msgid "Supplier Invoices" -msgstr "" +msgstr "ใบแจ้งหนี้จากผู้จัดจำหน่าย" #. module: purchase #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique !" -msgstr "" +msgstr "เลขที่เอกสารห้ามซ้ำกัน!" #. module: purchase #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "" +msgstr "สร้างจากใบรับ/จ่ายสินค้า" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" -msgstr "" +msgstr "ไม่มีรายการาคา!" #. module: purchase #: field:purchase.order.line,product_qty:0 @@ -150,7 +162,7 @@ msgstr "จำนวน" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Select an Open Sale Order" -msgstr "" +msgstr "เลือกใบสั่งขายสถานะเปิด" #. module: purchase #: field:purchase.order,company_id:0 @@ -176,12 +188,12 @@ msgstr "กำหนดให้เป็นแบบร่าง" #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "ยกเว้นใบแจ้งหนี้" #. module: purchase #: model:product.pricelist,name:purchase.list0 msgid "Default Purchase Pricelist" -msgstr "" +msgstr "ใช้ค่าเริ่มต้นรายการราคาซื้อ" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_current_purchases @@ -195,6 +207,8 @@ msgid "" "customer.In this case, it will remove the warehouse link and set the " "customer location." msgstr "" +"ใส่ที่อยู่ในช่องนี้หากต้องการให้จัดส่งโดยตรงจากผู้จัดจำหน่ายไปยังลูกค้า, " +"สินค้าจะไม่ถูกส่งเข้าคลังแต่จะถูกตั้งค่าให้ส่งไปยังลูกค้าแทน" #. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 @@ -202,11 +216,13 @@ msgid "" "This pricelist will be used, instead of the default one, for purchases from " "the current partner" msgstr "" +"รายการราคานี้จะถูกใช้งานแทนที่รายการราคาเริ่มต้นสำหรับการสั่งซื้อที่เกิดจากคู" +"่ค้ารายนี้" #. module: purchase #: report:purchase.order:0 msgid "Fax :" -msgstr "" +msgstr "แฟกซ์ :" #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -214,17 +230,19 @@ msgid "" "The pricelist sets the currency used for this purchase order. It also " "computes the supplier price for the selected products/quantities." msgstr "" +"รายการราคาจะเลือกสกุลเงินให้กับใบสั่งซื้อนี้ " +"และจะคำนวณหาราคาซื้อของคู่ค้าปัจจุบันให้ตรงกับสินค้าและจำนวนที่เลือกไว้" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "ทยอยส่ง" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." -msgstr "" +msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว" #. module: purchase #: view:purchase.order:0 @@ -257,7 +275,7 @@ msgstr "หน่วยอ้างอิง" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree msgid "Purchases" -msgstr "จัดซื้อ" +msgstr "ประวัติใบสั่งซื้อ" #. module: purchase #: view:purchase.order:0 @@ -268,12 +286,14 @@ msgid "Notes" msgstr "บันทึก" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" "Please set one before choosing a product." msgstr "" +"คุณต้องเลือกรายการราคาและผู้จัดจำหน่ายลงในแบบฟอร์มใบสั่งซื้อ !\n" +"กรุณาเลือกก่อนที่จะเลือกสินค้า" #. module: purchase #: selection:purchase.report,month:0 @@ -304,7 +324,7 @@ msgstr "ใบสั่งซื้อ" #: view:purchase.order.line:0 #: field:purchase.order.line,order_id:0 msgid "Order Reference" -msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ" +msgstr "เลขที่" #. module: purchase #: report:purchase.order:0 @@ -314,7 +334,7 @@ msgstr "รวมสุทธิ :" #. module: purchase #: view:purchase.installer:0 msgid "Configure Your Purchases Management Application" -msgstr "" +msgstr "ตั้งค่าแอพพลิเคชั่นการจัดการซื้อ" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product @@ -325,7 +345,7 @@ msgstr "สินค้า" #. module: purchase #: field:purchase.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "ความก้าวหน้าการตั้งค่า" #. module: purchase #: model:process.transition,note:purchase.process_transition_packinginvoice0 @@ -333,6 +353,9 @@ msgid "" "A Pick list generates an invoice. Depending on the Invoicing control of the " "sale order, the invoice is based on delivered or on ordered quantities." msgstr "" +"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ " +"ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง " +"หรือเลือกจากจำนวนสินค้าที่สั่ง" #. module: purchase #: selection:purchase.order,state:0 @@ -342,7 +365,7 @@ msgid "Cancelled" msgstr "ยกเลิกแล้ว" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "จำนวนเงินที่ซื้อเกินขีดจำกัด" @@ -367,7 +390,7 @@ msgstr "ยกเว้นการจัดส่งสินค้า" #. module: purchase #: field:purchase.order.line,invoice_lines:0 msgid "Invoice Lines" -msgstr "" +msgstr "รายการจากใบแจ้งหนี้" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0 @@ -393,23 +416,23 @@ msgstr " เดือน " #. module: purchase #: view:purchase.order:0 msgid "Reference" -msgstr "ข้อมูลอ้างอิง" +msgstr "เลขที่" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" -msgstr "" +msgstr "ไม่สามารถลบใบสั่งซื้อที่อยู่ในสถานะ %s ได้!" #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "" +msgstr "ที่อยู่ปลายทาง" #. module: purchase #: model:ir.model,name:purchase.model_stock_move msgid "Stock Move" -msgstr "ย้ายสต็อก" +msgstr "รายการเคลื่อนไหวสินค้า" #. module: purchase #: view:purchase.report:0 @@ -418,10 +441,10 @@ msgid "Day" msgstr "วัน" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." -msgstr "" +msgstr "ใบสั่งซื้อ '%s' ถูกเปลี่ยนเป็นสถานะฉบับร่างแล้ว" #. module: purchase #: field:purchase.order.line,account_analytic_id:0 @@ -435,8 +458,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -450,7 +473,7 @@ msgstr "แผนการจัดซื้อเชิงวิเคราะ #. module: purchase #: model:ir.model,name:purchase.model_purchase_installer msgid "purchase.installer" -msgstr "" +msgstr "ตัวติดตั้งใบสั่งซื้อ" #. module: purchase #: selection:purchase.order.line,state:0 @@ -470,10 +493,10 @@ msgstr "รายการสั่งซื้อ" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "หน่วยของสินค้าไม่ถูกต้อง!" @@ -505,17 +528,17 @@ msgstr "ยืนยัน" #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice #: view:purchase.order:0 msgid "Invoice Control" -msgstr "การควบคุมใบแจ้งหนี้" +msgstr "เกี่ยวกับการแจ้งหนี้" #. module: purchase #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "พบข้อผิดพลาด! คุณไม่สามารถสร้างบริษัทที่มีลักษณะวนซ้ำกันได้" #. module: purchase #: field:purchase.order,partner_ref:0 msgid "Supplier Reference" -msgstr "" +msgstr "เลขที่อ้างอิงของผู้จัดจำหน่าย" #. module: purchase #: help:purchase.order,amount_tax:0 @@ -529,6 +552,9 @@ msgid "" "of the purchase order, the invoice is based on received or on ordered " "quantities." msgstr "" +"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ " +"ขึ้นอยู่กับการตั้งค่าในใบสั่งซื้อว่าเลือกให้สร้างใบแจ้งหนี้ " +"จากการสินค้าที่ได้รับ หรือเลือกจากจำนวนสินค้าที่สั่งซื้อ" #. module: purchase #: view:purchase.order:0 @@ -545,6 +571,8 @@ msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." msgstr "" +"ตัวช่วยการวิเคราะห์นี้ช่วยให้คุณตรวจสอบง่ายขึ้นและช่วยวิเคราะห์การรับคำสั่งซื" +"้อตลอดจนการประเมิณประสิทธิภาพการจัดส่งสินค้าของผู้จัดจำหน่าย" #. module: purchase #: report:purchase.quotation:0 @@ -573,10 +601,10 @@ msgid "Order Lines" msgstr "รายการสั่งซื้อ" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" -msgstr "" +msgstr "ไม่พบผู้จัดจำหน่าย!" #. module: purchase #: report:purchase.quotation:0 @@ -598,7 +626,7 @@ msgstr "จำนวนเงินที่ไม่ต้องเสียภ #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist msgid "Pricelists" -msgstr "" +msgstr "รายการราคา" #. module: purchase #: field:purchase.report,partner_address_id:0 @@ -615,6 +643,12 @@ msgid "" "Manual: allows you to generate suppliers invoices by chosing in the " "uninvoiced lines of all manual purchase orders." msgstr "" +"จากใบสั่งซื้อ: ใบแจ้งหนี้ฉบับร่างจะถูกสร้างขึ้นโดยยึดข้อมูลจากใบสั่งซื้อนี้ " +"เจ้าหน้าที่บัญชีเพียงแค่ยืนยันความถูกต้องของใบแจ้งหนี้\n" +"จากใบรับ: ใบแจ้งหนี้ฉบับร่างจะถูกสร้างขึ้นโดยยึดข้อมูลจากการรับสินค้า\n" +"กำหนดเอง: " +"อนุญาตให้สร้างใบแจ้งหนี้โดยเลือกรายการที่ยังไม่ถูกแจ้งหนี้ทั้งหมดของใบสั่งซื้" +"อปัจจุบัน นำมาสร้างเป็นใบแจ้งหนี้" #. module: purchase #: help:purchase.order,invoice_ids:0 @@ -622,9 +656,9 @@ msgid "Invoices generated for a purchase order" msgstr "ใบแจ้งหนี้ที่สร้างขึ้นสำหรับการสั่งซื้อ" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -638,12 +672,12 @@ msgstr "ข้อมูลทั่วไป" #. module: purchase #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "กระดานงานของฉัน" #. module: purchase #: report:purchase.order:0 msgid "Purchase Order Confirmation N°" -msgstr "" +msgstr "ยืนยันใบสั่งซื้อเลขที่:" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all @@ -669,7 +703,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "From Order" -msgstr "จากการ สั่งซื้อ" +msgstr "สร้างจากใบสั่งซื้อ" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0 @@ -679,10 +713,10 @@ msgstr "สร้างใบแจ้งหนี้" #. module: purchase #: field:purchase.order.line,move_dest_id:0 msgid "Reservation Destination" -msgstr "" +msgstr "ปลายทางการจอง" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "การกระทำไม่ถูกต้อง !" @@ -692,7 +726,7 @@ msgstr "การกระทำไม่ถูกต้อง !" #: selection:purchase.order.line,state:0 #: selection:purchase.report,state:0 msgid "Done" -msgstr "เสร็จแล้ว" +msgstr "เสร็จสมบูรณ์" #. module: purchase #: selection:purchase.report,month:0 @@ -760,7 +794,7 @@ msgid " Month-1 " msgstr " เดือน - 1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,10 +805,11 @@ msgid "Manual" msgstr "กำหนดเอง" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" +"คุณต้องยกเลิกใบรับ/จ่ายสินค้าทั้งหมดที่เกี่ยวข้องกับใบสั่งซื้อนี้ก่อน" #. module: purchase #: view:purchase.order:0 @@ -811,7 +846,7 @@ msgstr "" #: model:process.node,name:purchase.process_node_invoiceafterpacking0 #: model:process.node,name:purchase.process_node_invoicecontrol0 msgid "Draft Invoice" -msgstr "" +msgstr "ใบแจ้งหนี้ฉบับร่าง" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 @@ -833,18 +868,18 @@ msgstr "" #. module: purchase #: field:purchase.installer,purchase_requisition:0 msgid "Purchase Requisition" -msgstr "" +msgstr "ใบขอซื้อ" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "หมวดหมู่ของหน่วยนับ" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "วันที่จัดส่งสินค้า" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move @@ -855,13 +890,13 @@ msgstr "" #. module: purchase #: model:ir.model,name:purchase.model_procurement_order msgid "Procurement" -msgstr "" +msgstr "ใบจัดหาสินค้า" #. module: purchase #: view:purchase.order:0 #: field:purchase.order,invoice_ids:0 msgid "Invoices" -msgstr "" +msgstr "ใบแจ้งหนี้" #. module: purchase #: model:process.node,note:purchase.process_node_purchaseorder0 @@ -871,7 +906,7 @@ msgstr "" #. module: purchase #: field:purchase.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "รูปภาพ" #. module: purchase #: view:purchase.report:0 @@ -882,10 +917,9 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,month:0 msgid "Month" -msgstr "" +msgstr "เดือน" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -893,29 +927,29 @@ msgstr "" #. module: purchase #: report:purchase.quotation:0 msgid "Request for Quotation :" -msgstr "" +msgstr "ใบแจ้งขอใบเสนอราคา" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_waiting msgid "Purchase Order Waiting Approval" -msgstr "" +msgstr "ใบสั่งซื้อรอการอนุมัติ" #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" -msgstr "" +msgstr "รวมจำนวนเงิน(ไม่รวมภาษี)" #. module: purchase #: field:purchase.order,shipped:0 #: field:purchase.order,shipped_rate:0 msgid "Received" -msgstr "" +msgstr "สินค้าที่ได้รับ" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "รายการสินค้าที่สั่งซื้อ" #. module: purchase #: help:purchase.order,picking_ids:0 @@ -927,47 +961,53 @@ msgstr "" #: model:ir.module.module,shortdesc:purchase.module_meta_information #: model:ir.ui.menu,name:purchase.menu_procurement_management msgid "Purchase Management" -msgstr "" +msgstr "การจัดการซื้อ" #. module: purchase #: model:process.node,note:purchase.process_node_invoiceafterpacking0 #: model:process.node,note:purchase.process_node_invoicecontrol0 msgid "To be reviewed by the accountant." -msgstr "" +msgstr "รอการตรวจสอบอีกครั้งจากเจ้าหน้าที่บัญชี" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase #: report:purchase.order:0 msgid "Taxes :" -msgstr "" +msgstr "ภาษี :" #. module: purchase #: field:purchase.order,invoiced_rate:0 #: field:purchase.order.line,invoiced:0 msgid "Invoiced" -msgstr "" +msgstr "แจ้งหนี้แล้ว" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,category_id:0 msgid "Category" -msgstr "" +msgstr "หมวดหมู่" #. module: purchase #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 msgid "State of the Purchase Order." -msgstr "" +msgstr "สถานะใบสั่งซื้อ" #. module: purchase #: view:purchase.report:0 msgid " Year " -msgstr "" +msgstr " ปี " #. module: purchase #: field:purchase.report,state:0 @@ -977,14 +1017,14 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice msgid "Create invoices" -msgstr "" +msgstr "สร้างใบแจ้งหนี้" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line #: view:purchase.order.line:0 #: field:stock.move,purchase_line_id:0 msgid "Purchase Order Line" -msgstr "" +msgstr "รายการสั่งซื้อ" #. module: purchase #: constraint:res.partner:0 @@ -994,17 +1034,17 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Calendar View" -msgstr "" +msgstr "มุมมองปฏิทิน" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_group msgid "Purchase Order Merge" -msgstr "" +msgstr "รวมใบสั่งซื้อ" #. module: purchase #: report:purchase.quotation:0 msgid "Regards," -msgstr "" +msgstr "ด้วยความเคารพ," #. module: purchase #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier @@ -1015,7 +1055,7 @@ msgstr "" #. module: purchase #: view:res.partner:0 msgid "Purchase Properties" -msgstr "" +msgstr "เกี่ยวกับการสั่งซื้อ" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1033,7 +1073,7 @@ msgstr "" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "ช่องนี้บ่งบอกถึงใบแจ้งหนี้ได้รับการจ่ายเงินแล้ว" #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 @@ -1043,7 +1083,7 @@ msgstr "" #. module: purchase #: view:purchase.installer:0 msgid "Configure" -msgstr "" +msgstr "ตั้งค่า" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_qty_per_product @@ -1082,7 +1122,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1139,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1153,7 +1193,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1413,7 +1453,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1525,7 +1565,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1669,7 +1709,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1746,7 +1786,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1794,3 +1834,9 @@ msgstr "" #~ msgid "Purchase Orders in Progress" #~ msgstr "ใบสั่งซื้ออยู่ระหว่างดำเนินการ" + +#~ msgid "From Picking" +#~ msgstr "จากใบรับสินค้า" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "รายการสั่งซื้อยังไม่ถูกแจ้งหนี้" diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po index b5e9cd4ba8c..7718fc53e82 100644 --- a/addons/purchase/i18n/tlh.po +++ b/addons/purchase/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -220,7 +220,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -267,7 +267,7 @@ msgid "Notes" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -341,7 +341,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -395,7 +395,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -417,7 +417,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -434,8 +434,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -572,7 +572,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -681,7 +681,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -759,7 +759,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -770,7 +770,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -884,7 +884,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -937,7 +936,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1081,7 +1086,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1098,14 +1103,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1152,7 +1157,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1412,7 +1417,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1524,7 +1529,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1668,7 +1673,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1745,7 +1750,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po index fd8bbbfe065..759c376f714 100644 --- a/addons/purchase/i18n/tr.po +++ b/addons/purchase/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -22,12 +22,15 @@ msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." msgstr "" +"Alıcı, tedarikçiye gönderilmeden önce RFQ'yu onaylamalıdır. RFQ onaylanmış " +"bir Satınalma Siparişi haline gelir." #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" +"Satınalma siparişini, Alış Sipariş Kalemleri olmadan onaylayamazsınız." #. module: purchase #: field:purchase.order,invoiced:0 @@ -42,17 +45,19 @@ msgid "Destination" msgstr "Hedef" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" msgstr "" +"Aynı kategoride, ürün satınalma biriminden başka, bir ürün birimi seçmeniz " +"gerekir" #. module: purchase #: help:purchase.report,date:0 msgid "Date on which this document has been created" -msgstr "" +msgstr "Bu belgenin oluşturulduğu tarih" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -66,16 +71,24 @@ msgid "" "supplier invoices: based on the order, based on the receptions or manual " "encoding." msgstr "" +"Ürün almak istediğinizde bir tedarikçiye teklif isteği oluşturabilirsiniz, " +"ancak satınalma henüz onaylamış değildir. Bu menüyü lojistik kurallarınız " +"(minimum stok, MTO vb.) bazında otomatik olarak oluşturulan teklif " +"isteklerini gözden geçirmek için de kullanabilirsiniz. Sipariş " +"onaylandığında, teklif talebini bir satınalma siparişine " +"dönüştürebilirsiniz. Uzatılmış arayüzü kullanırsanız (kullanıcı tercihleri), " +"tedarikçi faturalarınızı kontrol etme yönteminizi seçebilirsiniz: sipariş " +"bazında, manuel kodlama veya resepsiyon bazında." #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "İrsaliyeden" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Faturalandırılmadı" #. module: purchase #: field:purchase.order,dest_address_id:0 @@ -100,7 +113,7 @@ msgstr "Tedarikçi" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Do you want to generate the supplier invoices ?" -msgstr "" +msgstr "Tedarikçi faturalarını oluşturmak istiyor musunuz?" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action @@ -109,35 +122,38 @@ msgid "" "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." msgstr "" +"Bu menüyü referanslar, tedarikçi, ürün vb. göre satınalma siparişlerinizde " +"arama yapmak için kullanın. Her bir satın alma siparişi için, alınan " +"ürünleri izleyebilir ve tedarikçi faturalarını kontrol edebilirsiniz." #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar" #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:156 #, python-format msgid "Supplier Invoices" -msgstr "" +msgstr "Tedarikçi Faturaları" #. module: purchase #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique !" -msgstr "" +msgstr "Sipariş Referansı özgün olmalıdır!" #. module: purchase #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "" +msgstr "Alım listesinden" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" -msgstr "" +msgstr "Fiyat listesi yok!" #. module: purchase #: field:purchase.order.line,product_qty:0 @@ -149,7 +165,7 @@ msgstr "Miktar" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Select an Open Sale Order" -msgstr "" +msgstr "Bir Açık Satış Siparişi Seçin" #. module: purchase #: field:purchase.order,company_id:0 @@ -157,14 +173,14 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,company_id:0 msgid "Company" -msgstr "" +msgstr "Şirket" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph #: view:purchase.report:0 msgid "Monthly Purchase by Category" -msgstr "" +msgstr "Kategoriye göre Aylık Satınalma" #. module: purchase #: view:purchase.order:0 @@ -185,7 +201,7 @@ msgstr "Varsayılan Alış Fiyat Listesi" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_current_purchases msgid "Current purchases" -msgstr "" +msgstr "Mevcut satınalmalar" #. module: purchase #: help:purchase.order,dest_address_id:0 @@ -194,6 +210,9 @@ msgid "" "customer.In this case, it will remove the warehouse link and set the " "customer location." msgstr "" +"Doğrudan tedarikçiden müşteriye teslim etmek istiyorsanız, bir adres girin. " +"Bu durumda, depo bağlantısını kaldıracak ve müşteri lokasyonunu " +"ayarlayacaktır." #. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 @@ -201,11 +220,13 @@ msgid "" "This pricelist will be used, instead of the default one, for purchases from " "the current partner" msgstr "" +"Mevcut ortaktan satınalmalarda, varsayılan yerine bu fiyat listesi " +"kullanılacaktır" #. module: purchase #: report:purchase.order:0 msgid "Fax :" -msgstr "" +msgstr "Faks:" #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -213,17 +234,20 @@ msgid "" "The pricelist sets the currency used for this purchase order. It also " "computes the supplier price for the selected products/quantities." msgstr "" +"Fiyat listesi bu satınalma siparişi için kullanılacak para birimini " +"belirler. Ayrıca, seçilen ürünler/miktarlar için tedarikçi fiyatını da " +"hesaplar." #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "Kısmi Alım" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." -msgstr "" +msgstr "Satınalma siparişi '%s' onaylandı." #. module: purchase #: view:purchase.order:0 @@ -241,7 +265,7 @@ msgstr "Onaylanmış" #. module: purchase #: view:purchase.report:0 msgid "Reference UOM" -msgstr "" +msgstr "Referans UOM" #. module: purchase #: view:purchase.order:0 @@ -251,12 +275,12 @@ msgstr "Menşei" #. module: purchase #: field:purchase.report,product_uom:0 msgid "Reference UoM" -msgstr "" +msgstr "Referans UoM" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree msgid "Purchases" -msgstr "" +msgstr "Satınalmalar" #. module: purchase #: view:purchase.order:0 @@ -267,17 +291,19 @@ msgid "Notes" msgstr "Notlar" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" "Please set one before choosing a product." msgstr "" +"Satınalma formunda bir fiyat listesi veya bir tedarikçi seçmeniz gerekiyor!\n" +"Lütfen bir ürün seçmeden önce birini belirtin." #. module: purchase #: selection:purchase.report,month:0 msgid "September" -msgstr "" +msgstr "Eylül" #. module: purchase #: report:purchase.order:0 @@ -313,18 +339,18 @@ msgstr "Net Toplam :" #. module: purchase #: view:purchase.installer:0 msgid "Configure Your Purchases Management Application" -msgstr "" +msgstr "Satınalma Yönetim Uygulamanızı Yapılandırın" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form msgid "Products" -msgstr "" +msgstr "Ürünler" #. module: purchase #: field:purchase.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Yapılandırma İlerleyişi" #. module: purchase #: model:process.transition,note:purchase.process_transition_packinginvoice0 @@ -332,6 +358,8 @@ msgid "" "A Pick list generates an invoice. Depending on the Invoicing control of the " "sale order, the invoice is based on delivered or on ordered quantities." msgstr "" +"Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne " +"bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır." #. module: purchase #: selection:purchase.order,state:0 @@ -341,15 +369,15 @@ msgid "Cancelled" msgstr "İptal Edildi" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" -msgstr "" +msgstr "Satınalma miktarı limitin üzerinde" #. module: purchase #: view:purchase.order:0 msgid "Convert to Purchase Order" -msgstr "" +msgstr "Satınalma Siparişine Dönüştür" #. module: purchase #: field:purchase.order,pricelist_id:0 @@ -366,7 +394,7 @@ msgstr "İstisnai Sevkiyat" #. module: purchase #: field:purchase.order.line,invoice_lines:0 msgid "Invoice Lines" -msgstr "" +msgstr "Fatura Kalemleri" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0 @@ -377,17 +405,17 @@ msgstr "Gelen Ürünler" #. module: purchase #: model:process.node,name:purchase.process_node_packinginvoice0 msgid "Outgoing Products" -msgstr "" +msgstr "Giden Ürünler" #. module: purchase #: view:purchase.order:0 msgid "Manually Corrected" -msgstr "" +msgstr "Manuel Olarak Düzeltildi" #. module: purchase #: view:purchase.report:0 msgid " Month " -msgstr "" +msgstr " Ay " #. module: purchase #: view:purchase.order:0 @@ -395,32 +423,32 @@ msgid "Reference" msgstr "Referans" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" -msgstr "" +msgstr "%s Durumundaki Satınalma Sipariş(ler)i silinemez!" #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "" +msgstr "Varılacak Adres İlgili Kişi" #. module: purchase #: model:ir.model,name:purchase.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Stok Hareketi" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,day:0 msgid "Day" -msgstr "" +msgstr "Gün" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." -msgstr "" +msgstr "Satınalma siparişi '%s' taslak olarak ayarlandı." #. module: purchase #: field:purchase.order.line,account_analytic_id:0 @@ -431,30 +459,30 @@ msgstr "Analiz Hesabı" #: view:purchase.report:0 #: field:purchase.report,nbr:0 msgid "# of Lines" -msgstr "" +msgstr "# / Satır" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" -msgstr "" +msgstr "Uyarı" #. module: purchase #: field:purchase.installer,purchase_analytic_plans:0 msgid "Purchase Analytic Plans" -msgstr "" +msgstr "Satınalma Analitik Planları" #. module: purchase #: model:ir.model,name:purchase.model_purchase_installer msgid "purchase.installer" -msgstr "" +msgstr "purchase.installer" #. module: purchase #: selection:purchase.order.line,state:0 msgid "Draft" -msgstr "" +msgstr "Taslak" #. module: purchase #: report:purchase.order:0 @@ -469,13 +497,13 @@ msgstr "Sipariş Kalemi" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "Bir alım gerçekleştirildiğini gösterir" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" -msgstr "" +msgstr "Hatalı Birim!" #. module: purchase #: model:process.node,name:purchase.process_node_confirmpurchaseorder0 @@ -487,7 +515,7 @@ msgstr "Onaylandı" #: view:purchase.report:0 #: field:purchase.report,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Ortalama Fiyat" #. module: purchase #: report:purchase.order:0 @@ -509,17 +537,17 @@ msgstr "Fatura Kontrolü" #. module: purchase #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Hata! Yinelemeli şirketler oluşturamazsınız." #. module: purchase #: field:purchase.order,partner_ref:0 msgid "Supplier Reference" -msgstr "" +msgstr "Tedarikçi Referansı" #. module: purchase #: help:purchase.order,amount_tax:0 msgid "The tax amount" -msgstr "" +msgstr "Vergi miktarı" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -528,6 +556,9 @@ msgid "" "of the purchase order, the invoice is based on received or on ordered " "quantities." msgstr "" +"Alım listesi bir tedarikçi faturası oluşturur. Satınalma siparişi faturalama " +"kontrolüne bağlı olarak, fatura alınanlara ya da sipariş edilen miktarlara " +"dayanır." #. module: purchase #: view:purchase.order:0 @@ -536,7 +567,7 @@ msgstr "" #: field:purchase.order.line,state:0 #: view:purchase.report:0 msgid "State" -msgstr "" +msgstr "Durum" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po @@ -544,11 +575,14 @@ msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." msgstr "" +"Resepsiyon Analizi şirketinizin sipariş resepsiyonlarını ve tedarikçi " +"teslimatlarınızın performansını kolayca kontrol ve analiz edebilmenizi " +"sağlar." #. module: purchase #: report:purchase.quotation:0 msgid "Tel.:" -msgstr "" +msgstr "Tel.:" #. module: purchase #: model:ir.model,name:purchase.model_stock_picking @@ -559,12 +593,12 @@ msgstr "Hazırlık Listesi" #. module: purchase #: view:purchase.order:0 msgid "Print" -msgstr "" +msgstr "Yazdır" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group msgid "Merge Purchase orders" -msgstr "" +msgstr "Satınalma siparişlerini birleştir" #. module: purchase #: field:purchase.order,order_line:0 @@ -572,10 +606,10 @@ msgid "Order Lines" msgstr "Sipariş Kalemleri" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" -msgstr "" +msgstr "Ortak yok!" #. module: purchase #: report:purchase.quotation:0 @@ -586,7 +620,7 @@ msgstr "Fax:" #: view:purchase.report:0 #: field:purchase.report,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Toplam Fiyat" #. module: purchase #: view:purchase.order:0 @@ -597,12 +631,12 @@ msgstr "Tutar" #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist msgid "Pricelists" -msgstr "" +msgstr "Fiyat listeleri" #. module: purchase #: field:purchase.report,partner_address_id:0 msgid "Address Contact Name" -msgstr "" +msgstr "Adres İlgili Kişi" #. module: purchase #: help:purchase.order,invoice_method:0 @@ -614,30 +648,36 @@ msgid "" "Manual: allows you to generate suppliers invoices by chosing in the " "uninvoiced lines of all manual purchase orders." msgstr "" +"Şiparişten: satınalma siparişine dayanarak önceden bir taslak fatura " +"oluşturulacaktır. Hesap uzmanının bu kontrol faturasını onaylaması gerekir.\n" +"İrsaliyeden: onaylanan resepsiyonlara dayanarak önceden bir taslak fatura " +"oluşturulacaktır.\n" +"Manuel: tüm manuel satınalma siparişlerinin faturalanmamış kalemleri " +"arasından seçim yaparak tedarikçi faturaları oluşturmanızı sağlar." #. module: purchase #: help:purchase.order,invoice_ids:0 msgid "Invoices generated for a purchase order" -msgstr "" +msgstr "Bir satınalma siparişi için oluşturulan faturalar" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" -msgstr "" +msgstr "Hata!" #. module: purchase #: view:purchase.order.line:0 msgid "General Information" -msgstr "" +msgstr "Genel Bilgiler" #. module: purchase #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "My Board" #. module: purchase #: report:purchase.order:0 @@ -651,11 +691,14 @@ msgid "" "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your suppliers, etc." msgstr "" +"Satınalma Analizi şirketinizin satınalma geçmişi ve performansını kolayca " +"kontrol ve analiz etmenizi sağlar. Bu menüden ciro performansınızı, " +"tedarikçilerinizin teslimat performansını vb. takip edebilirsiniz." #. module: purchase #: view:purchase.order:0 msgid "Approved by Supplier" -msgstr "" +msgstr "Tedarikçi tarafından onaylandı" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0 @@ -664,6 +707,9 @@ msgid "" "order is 'On picking'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"Satınalma siparişi 'Alım' durumundaysa, fatura otomatik olarak oluşturulur. " +"Fatura hesap uzmanı tarafından manuel olarak da oluşturulabilir (Fatura " +"kontrolü = Manuel)." #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -681,10 +727,10 @@ msgid "Reservation Destination" msgstr "Rezervasyon Yeri" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "Geçersiz işlem!" #. module: purchase #: selection:purchase.order,state:0 @@ -696,19 +742,19 @@ msgstr "Bitti" #. module: purchase #: selection:purchase.report,month:0 msgid "July" -msgstr "" +msgstr "Temmuz" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase #: view:res.company:0 msgid "Configuration" -msgstr "" +msgstr "Yapılandırma" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier #: view:purchase.report:0 msgid "Purchase by supplier" -msgstr "" +msgstr "Tedarikçiye göre satınalma" #. module: purchase #: view:purchase.order:0 @@ -718,7 +764,7 @@ msgstr "Toplam Tutar" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking msgid "Receptions" -msgstr "" +msgstr "Resepsiyonlar" #. module: purchase #: field:purchase.order,validator:0 @@ -734,6 +780,10 @@ msgid "" "according to your settings. Once you receive a supplier invoice, you can " "match it with the draft invoice and validate it." msgstr "" +"Bu menüyü tedarikçinizden alınacak faturaları kontrol etmek için kullanın. " +"OpenERP, ayarlarınıza bağlı olarak satınalma siparişlerinizden veya " +"resepsiyonlarınızdan önceden taslak faturalar oluşturur. Bir tedarikçi " +"faturası aldığınızda, taslak faturayla karşılaştırıp onaylayabilirsiniz." #. module: purchase #: model:process.node,name:purchase.process_node_draftpurchaseorder0 @@ -744,7 +794,7 @@ msgstr "Teklif İsteği" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice msgid "Supplier Invoices to Receive" -msgstr "" +msgstr "Alınacak Tedarikçi Faturaları" #. module: purchase #: help:purchase.installer,purchase_requisition:0 @@ -752,17 +802,20 @@ msgid "" "Manages your Purchase Requisition and allows you to easily keep track and " "manage all your purchase orders." msgstr "" +"Satınalma Talebinizi yönetir ve tüm satınalma siparişlerinizi kolayca takip " +"edip yönetmenizi sağlar." #. module: purchase #: view:purchase.report:0 msgid " Month-1 " -msgstr "" +msgstr " Ay-1 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" +"Bu şirket tarafından belirtilen satınalma günlüğü yok: \"%s\" (id:%d)" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -770,32 +823,33 @@ msgid "Manual" msgstr "Manuel" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" +"Öncelikle bu satınalma siparişine bağlı tüm alımları iptal etmeniz gerekir." #. module: purchase #: view:purchase.order:0 #: field:purchase.order.line,date_order:0 #: field:purchase.report,date:0 msgid "Order Date" -msgstr "" +msgstr "Sipariş Tarihi" #. module: purchase #: model:process.node,note:purchase.process_node_productrecept0 msgid "Incoming products to control" -msgstr "" +msgstr "Kontrol edilecek gelen ürünler" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 msgid "Approbation" -msgstr "" +msgstr "Onay" #. module: purchase #: view:purchase.report:0 msgid "Purchase Orders Statistics" -msgstr "" +msgstr "Satınalma Siparişi İstatistikleri" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2 @@ -805,6 +859,11 @@ msgid "" "supplier invoice yet. Once you are ready to receive a supplier invoice, you " "can generate a draft supplier invoice based on the lines from this menu." msgstr "" +"Bir satınalma siparişindeki faturalama kontrolünü \"Manuel\" olarak " +"ayarlarsanız, tedarikçiden henüz faturasını almadığınız tüm satınalma " +"sipariş kalemlerinizi buradan takip edebilirsiniz. Bir tedarikçi faturası " +"almak için hazır olduğunuzda, bu menüdeki satırlar bazında bir taslak " +"tedarikçi faturası hazırlayabilirsiniz." #. module: purchase #: model:process.node,name:purchase.process_node_invoiceafterpacking0 @@ -815,7 +874,7 @@ msgstr "Taslak Fatura" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 msgid "Manages analytic distribution and purchase orders." -msgstr "" +msgstr "Analitik dağıtım ve satınalma siparişlerini yönetir." #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -823,71 +882,72 @@ msgid "" "This is computed as the minimum scheduled date of all purchase order lines' " "products." msgstr "" +"Bu, tüm satınalma sipariş kalemine ait ürünleri minimum zamanlanan tarih " +"olarak hesaplar." #. module: purchase #: selection:purchase.report,month:0 msgid "August" -msgstr "" +msgstr "Ağustos" #. module: purchase #: field:purchase.installer,purchase_requisition:0 msgid "Purchase Requisition" -msgstr "" +msgstr "Satınalma Talebi" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "Kategori Ölçüm Birimleri" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "Teslimat Günleri" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory msgid "Receive Products" -msgstr "" +msgstr "Ürünleri Al" #. module: purchase #: model:ir.model,name:purchase.model_procurement_order msgid "Procurement" -msgstr "" +msgstr "Satınalma" #. module: purchase #: view:purchase.order:0 #: field:purchase.order,invoice_ids:0 msgid "Invoices" -msgstr "" +msgstr "Faturalar" #. module: purchase #: model:process.node,note:purchase.process_node_purchaseorder0 msgid "Confirmed purchase order to invoice" -msgstr "" +msgstr "Faturalandırılacak onaylanan satınalma siparişi" #. module: purchase #: field:purchase.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Görüntü" #. module: purchase #: view:purchase.report:0 msgid "Total Orders Lines by User per month" -msgstr "" +msgstr "Aylık Toplam Kullanıcı Sipariş Kalemleri" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,month:0 msgid "Month" -msgstr "" +msgstr "Ay" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" -msgstr "" +msgstr "Tedarikçi Onayı Bekleniyor" #. module: purchase #: report:purchase.quotation:0 @@ -903,7 +963,7 @@ msgstr "Onay Bekleyen Alış Siparişi" #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" -msgstr "" +msgstr "Vergilendirilmemiş toplam tutar" #. module: purchase #: field:purchase.order,shipped:0 @@ -914,13 +974,13 @@ msgstr "Alınan" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "Sipariş edilen ürün listesi." #. module: purchase #: help:purchase.order,picking_ids:0 msgid "" "This is the list of picking list that have been generated for this purchase" -msgstr "" +msgstr "Bu satınalma için oluşturulmuş satınalma listesidir" #. module: purchase #: model:ir.module.module,shortdesc:purchase.module_meta_information @@ -932,12 +992,18 @@ msgstr "Satınalma Yönetimi" #: model:process.node,note:purchase.process_node_invoiceafterpacking0 #: model:process.node,note:purchase.process_node_invoicecontrol0 msgid "To be reviewed by the accountant." -msgstr "" +msgstr "Hesap uzmanı tarafından incelenecek." #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -955,28 +1021,28 @@ msgstr "Faturalandı" #: view:purchase.report:0 #: field:purchase.report,category_id:0 msgid "Category" -msgstr "" +msgstr "Kategori" #. module: purchase #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 msgid "State of the Purchase Order." -msgstr "" +msgstr "Satınalma Siparişinin Durumu." #. module: purchase #: view:purchase.report:0 msgid " Year " -msgstr "" +msgstr " Yıl " #. module: purchase #: field:purchase.report,state:0 msgid "Order State" -msgstr "" +msgstr "Sipariş Durumu" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice msgid "Create invoices" -msgstr "" +msgstr "Fatura oluştur" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line @@ -988,7 +1054,7 @@ msgstr "Alış Sipariş Kalemi" #. module: purchase #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Hata! Yinelemeli üyeler oluşturamazsınız." #. module: purchase #: view:purchase.order:0 @@ -998,23 +1064,23 @@ msgstr "Takvimi Göster" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_group msgid "Purchase Order Merge" -msgstr "" +msgstr "Satınalma Siparişi Birleştirme" #. module: purchase #: report:purchase.quotation:0 msgid "Regards," -msgstr "" +msgstr "Saygılar," #. module: purchase #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier #: view:purchase.report:0 msgid "Negotiation by Supplier" -msgstr "" +msgstr "Tedarikçi Cirosu" #. module: purchase #: view:res.partner:0 msgid "Purchase Properties" -msgstr "" +msgstr "Satınalma Özellikleri" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1023,6 +1089,9 @@ msgid "" "the buyer. Depending on the Invoicing control of the purchase order, the " "invoice is based on received or on ordered quantities." msgstr "" +"Satınalma siparişi, alıcı tarafından onaylandığı anda bir tedarikçi faturası " +"oluşturur. Satınalma siparişi faturalama kontrolüne göre, fatura alınanlara " +"ya da sipariş edilen miktarlara dayanır." #. module: purchase #: field:purchase.order,amount_untaxed:0 @@ -1032,104 +1101,106 @@ msgstr "Tutar" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "Bir faturanın ödendiğini gösterir" #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 msgid "Outgoing products to invoice" -msgstr "" +msgstr "Faturalandırılacak giden ürünler" #. module: purchase #: view:purchase.installer:0 msgid "Configure" -msgstr "" +msgstr "Yapılandır" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_qty_per_product #: view:purchase.report:0 msgid "Qty. per product" -msgstr "" +msgstr "Ürün miktarı" #. module: purchase #: constraint:stock.move:0 msgid "You try to assign a lot which is not from the same product" -msgstr "" +msgstr "Aynı üründen olmayan bir lot atamaya çalışıyorsunuz" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "" +msgstr "Bu belgenin oluşturulduğu tarih." #. module: purchase #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Satışlar ve Satınalmalar" #. module: purchase #: selection:purchase.report,month:0 msgid "June" -msgstr "" +msgstr "Haziran" #. module: purchase #: model:ir.model,name:purchase.model_purchase_report msgid "Purchases Orders" -msgstr "" +msgstr "Satınalma Siparişleri" #. module: purchase #: view:purchase.order.line:0 msgid "Manual Invoices" -msgstr "" +msgstr "Manuel Faturalar" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" -msgstr "" +msgstr "Bir satınalma belirtilen sınırın üzerindeki bir tutarla onaylandı" #. module: purchase #: selection:purchase.report,month:0 msgid "November" -msgstr "" +msgstr "Kasım" #. module: purchase #: view:purchase.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Uzatılmış Filtreler..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" -msgstr "" +msgstr "Bu ürün için belirtilen masraf tutarı yok: \"%s\" (id:%d)" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" +"Öncelikle bu satınalma siparişine bağlı tüm faturaları iptal etmeniz gerekir." #. module: purchase #: code:addons/purchase/wizard/purchase_order_group.py:48 #, python-format msgid "Please select multiple order to merge in the list view." msgstr "" +"Lütfen liste görünümünde birleştirmek için birden fazla sipariş seçin." #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 msgid "Pick list generated" -msgstr "" +msgstr "Alım listesi oluşturuldu" #. module: purchase #: view:purchase.order:0 msgid "Exception" -msgstr "" +msgstr "İstisna" #. module: purchase #: selection:purchase.report,month:0 msgid "October" -msgstr "" +msgstr "Ekim" #. module: purchase #: view:purchase.order:0 @@ -1150,24 +1221,36 @@ msgid "" "\n" " " msgstr "" +"\n" +" Satınalma modülü, bir tedarikçiden mal satın almak üzere bir satınalma " +"siparişi oluşturmak içindir.\n" +" Belirli mevcut sipariş için bir tedarikçi faturası oluşturulur\n" +" Şunları içeren satınalma yönetimi performans tablosu:\n" +" * Mevcut Satınalma Siparişleri\n" +" * Taslak Satınalma Siparişleri\n" +" * Aylık tutar ve miktar grafiği \n" +"\n" +" " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " "less." msgstr "" +"Seçilen tedarikçi %s'a ayarlanan minimum miktara sahiptir, daha düşük bir " +"satınalma yapamazsınız." #. module: purchase #: selection:purchase.report,month:0 msgid "January" -msgstr "" +msgstr "Ocak" #. module: purchase #: model:ir.model,name:purchase.model_res_company msgid "Companies" -msgstr "" +msgstr "Şirketler" #. module: purchase #: view:purchase.order:0 @@ -1177,40 +1260,40 @@ msgstr "Alış Siparişini İptal Et" #. module: purchase #: constraint:stock.move:0 msgid "You must assign a production lot for this product" -msgstr "" +msgstr "Bu ürüne bir üretim grubu atamanız gerekir" #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 msgid "A pick list is generated to track the incoming products." -msgstr "" +msgstr "Gelen ürünleri izlemek için bir alım listesi oluşturulur." #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard msgid "Dashboard" -msgstr "" +msgstr "Performans tablosu" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_standard:0 msgid "Products Value" -msgstr "" +msgstr "Ürün Tutarı" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type msgid "Pricelists Types" -msgstr "" +msgstr "Fiyat Listesi Türleri" #. module: purchase #: view:purchase.order:0 #: view:purchase.report:0 msgid "Quotations" -msgstr "" +msgstr "Teklifler" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree #: view:purchase.report:0 msgid "Purchase order per month" -msgstr "" +msgstr "Aylık satınalma siparişi" #. module: purchase #: view:purchase.order.line:0 @@ -1220,18 +1303,18 @@ msgstr "Geçmiş Bilgisi" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form msgid "Products by Category" -msgstr "" +msgstr "Kategoriye göre ürünler" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay:0 msgid "Days to Validate" -msgstr "" +msgstr "Onaylama Günleri" #. module: purchase #: help:purchase.order,origin:0 msgid "Reference of the document that generated this purchase order request." -msgstr "" +msgstr "Bu satınalma sipariş talebini oluşturan belge referansı." #. module: purchase #: help:purchase.order,state:0 @@ -1243,6 +1326,13 @@ msgid "" "received, the state becomes 'Done'. If a cancel action occurs in the invoice " "or in the reception of goods, the state becomes in exception." msgstr "" +"Satınalma siparişi ya da teklif talebi durumu. Teklif, 'Taslak' durumundaki " +"bir satınalma siparişidir. Daha sonra sipariş kullanıcı tarafından " +"onaylanarak 'Onaylandı' durumuna geçmelidir. Ardından sipariş tedarikçi " +"tarafından onaylanarak 'Onaylandı' durumuna geçmelidir. Satınalma siparişi " +"ödenip alındığında, durum 'Tamamlandı' olarak değişir. Malların " +"resepsiyonunda ya da faturada bir iptal etme işlemi meydana gelirse, durum " +"istisna olarak değişir." #. module: purchase #: field:purchase.order.line,price_subtotal:0 @@ -1253,12 +1343,12 @@ msgstr "Alt Toplam" #: model:ir.actions.act_window,name:purchase.purchase_rfq #: model:ir.ui.menu,name:purchase.menu_purchase_rfq msgid "Requests for Quotation" -msgstr "" +msgstr "Teklif Talepleri" #. module: purchase #: help:purchase.order,date_approve:0 msgid "Date on which purchase order has been approved" -msgstr "" +msgstr "Satınalma siparişinin onaylandığı tarih" #. module: purchase #: selection:purchase.order,state:0 @@ -1275,13 +1365,13 @@ msgstr "Varsayılan Alış Fiyat Listesi Vers." #: view:purchase.installer:0 msgid "" "Extend your Purchases Management Application with additional functionalities." -msgstr "" +msgstr "Satınalma Yönetim Uygulamanızı ilave işlevselliklerle genişletin." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_install_module #: view:purchase.installer:0 msgid "Purchases Application Configuration" -msgstr "" +msgstr "Satınalma Uygulama Yapılandırması" #. module: purchase #: field:purchase.order,fiscal_position:0 @@ -1302,7 +1392,7 @@ msgstr "Fatura" #. module: purchase #: selection:purchase.report,month:0 msgid "December" -msgstr "" +msgstr "Aralık" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0 @@ -1322,7 +1412,7 @@ msgstr "Alış Sipariş Kalemleri" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 msgid "The supplier approves the Purchase Order." -msgstr "" +msgstr "Tedarikçi Satınalma Siparişini onaylar." #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -1335,27 +1425,27 @@ msgstr "Alış Siparişleri" #. module: purchase #: field:purchase.order,origin:0 msgid "Source Document" -msgstr "" +msgstr "Kaynak Belge" #. module: purchase #: view:purchase.order.group:0 msgid "Merge orders" -msgstr "" +msgstr "Siparişleri birleştir" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line_invoice msgid "Purchase Order Line Make Invoice" -msgstr "" +msgstr "Satınalma Sipariş Kalemi Faturalandırma" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 msgid "Incoming Shipments" -msgstr "" +msgstr "Gelen Sevkıyatlar" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all msgid "Total Orders by User per month" -msgstr "" +msgstr "Aylık Toplam Kullanıcı Siparişi" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation @@ -1367,14 +1457,14 @@ msgstr "Teklif İsteği" #. module: purchase #: report:purchase.order:0 msgid "Tél. :" -msgstr "" +msgstr "Tél. :" #. module: purchase #: field:purchase.order,create_uid:0 #: view:purchase.report:0 #: field:purchase.report,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Sorumlu" #. module: purchase #: report:purchase.order:0 @@ -1385,7 +1475,7 @@ msgstr "Bizim Sipariş Referansımız" #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Search Purchase Order" -msgstr "" +msgstr "Satınalma Siparişi Arama" #. module: purchase #: field:purchase.order,warehouse_id:0 @@ -1398,12 +1488,12 @@ msgstr "Depo" #: model:process.node,note:purchase.process_node_draftpurchaseorder0 #: model:process.node,note:purchase.process_node_draftpurchaseorder1 msgid "Request for Quotations." -msgstr "" +msgstr "Teklif talebi." #. module: purchase #: report:purchase.order:0 msgid "Date Req." -msgstr "" +msgstr "Talep Tarihi." #. module: purchase #: field:purchase.order,date_approve:0 @@ -1412,10 +1502,10 @@ msgid "Date Approved" msgstr "Onaylanmış Tarih" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" -msgstr "" +msgstr "Bu satınalma siparişi iptal edilemedi!" #. module: purchase #: report:purchase.order:0 @@ -1426,12 +1516,12 @@ msgstr "Birim Fiyat" #. module: purchase #: view:purchase.order:0 msgid "Delivery & Invoicing" -msgstr "" +msgstr "Teslimat ve Faturalama" #. module: purchase #: field:purchase.order.line,date_planned:0 msgid "Scheduled Date" -msgstr "" +msgstr "Zamanlanan Tarih" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase @@ -1447,7 +1537,7 @@ msgstr "Ürün" #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1 msgid "Confirmation" -msgstr "" +msgstr "Onaylama" #. module: purchase #: report:purchase.order:0 @@ -1459,7 +1549,7 @@ msgstr "Açıklama" #. module: purchase #: help:res.company,po_lead:0 msgid "This is the leads/security time for each purchase order." -msgstr "" +msgstr "Bu, her bir satınalma siparişi için tedarik/emniyet süresidir." #. module: purchase #: report:purchase.quotation:0 @@ -1470,12 +1560,12 @@ msgstr "Tahmini Teslimat Adresi" #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po msgid "Receptions Analysis" -msgstr "" +msgstr "Resepsiyon Analizi" #. module: purchase #: help:purchase.order,amount_untaxed:0 msgid "The amount without tax" -msgstr "" +msgstr "Vergilendirilmemiş tutar" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_supplier_address_form @@ -1484,6 +1574,9 @@ msgid "" "suppliers. You can track all your interactions with them through the History " "tab: emails, orders, meetings, etc." msgstr "" +"Tedarikçi kayıtlarınıza erişin ve tedarikçilerinizle olan iyi ilişkilerinizi " +"sürdürün. Geçmiş sekmesiyle tüm işlemlerinizi izleyebilirsiniz: e-postalar, " +"siparişler, toplantılar vb." #. module: purchase #: view:purchase.order:0 @@ -1494,7 +1587,7 @@ msgstr "Teslimat" #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_draft msgid "Request for Quotations" -msgstr "" +msgstr "Kotasyon Talebi" #. module: purchase #: field:purchase.order.line,product_uom:0 @@ -1510,7 +1603,7 @@ msgstr "Mik." #. module: purchase #: field:purchase.order,partner_address_id:0 msgid "Address" -msgstr "" +msgstr "Adres" #. module: purchase #: field:purchase.order.line,move_ids:0 @@ -1521,13 +1614,13 @@ msgstr "Rezervasyon" #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph #: view:purchase.report:0 msgid "Total Qty and Amount by month" -msgstr "" +msgstr "Aylık Toplam Miktar ve Tutar" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" -msgstr "" +msgstr "Satınalma siparişi iptal edilemedi!" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1 @@ -1535,22 +1628,24 @@ msgid "" "In case there is no supplier for this product, the buyer can fill the form " "manually and confirm it. The RFQ becomes a confirmed Purchase Order." msgstr "" +"Bu ürün için tedarikçi olmaması durumunda, alıcı formu manuel olarak " +"doldurup onaylayabilir. RFQ, onaylanan bir Satınalma Siparişi haline gelir." #. module: purchase #: selection:purchase.report,month:0 msgid "February" -msgstr "" +msgstr "Şubat" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase msgid "Products Categories" -msgstr "" +msgstr "Ürün Kategorileri" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all msgid "Purchase Analysis" -msgstr "" +msgstr "Satınalma Analizi" #. module: purchase #: report:purchase.order:0 @@ -1569,12 +1664,12 @@ msgstr "Tahmini Tarih" #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state #: view:purchase.report:0 msgid "Total price by product by state" -msgstr "" +msgstr "Ürün durumuna göre toplam fiyat" #. module: purchase #: report:purchase.quotation:0 msgid "TVA:" -msgstr "" +msgstr "TVA:" #. module: purchase #: report:purchase.order:0 @@ -1595,12 +1690,12 @@ msgstr "Alış Kontrolü" #. module: purchase #: selection:purchase.report,month:0 msgid "March" -msgstr "" +msgstr "Mart" #. module: purchase #: selection:purchase.report,month:0 msgid "April" -msgstr "" +msgstr "Nisan" #. module: purchase #: view:purchase.order.group:0 @@ -1617,17 +1712,29 @@ msgid "" "\n" " " msgstr "" +" Lütfen şunlara dikkat edin: \n" +" \n" +" Siparişler sadece şu durumlarda birleştirilecektir: \n" +" * Satınalma Siparişleri taslak halindeyken \n" +" * Satınalma Siparişleri aynı tedarikçiye ait olduğunda \n" +" * Satınalma Siparişleri aynı stok lokasyonu ve aynı fiyat listesine sahip " +"olduğunda \n" +" \n" +" Kalemler sadece şu durumlarda birleştirilebilir: \n" +" * Sipariş kalemleri, ürün, miktar ve birim haricinde tamamen aynı olduğunda " +"\n" +" " #. module: purchase #: view:purchase.report:0 #: field:purchase.report,name:0 msgid "Year" -msgstr "" +msgstr "Yıl" #. module: purchase #: field:purchase.report,negociation:0 msgid "Purchase-Standard Price" -msgstr "" +msgstr "Satınalma-Standart Fiyat" #. module: purchase #: model:product.pricelist.type,name:purchase.pricelist_type_purchase @@ -1648,7 +1755,7 @@ msgstr "Onayla" #. module: purchase #: view:purchase.order:0 msgid "To Approve" -msgstr "" +msgstr "Onaylamak için" #. module: purchase #: view:purchase.order.line:0 @@ -1666,12 +1773,20 @@ msgid "" " \n" "* The 'Cancelled' state is set automatically when user cancel purchase order." msgstr "" +" * Satınalma siparişi taslak durumundayken, otomatik olarak 'Taslak' durumu " +"ayarlanır. \n" +"* Satınalma siparişi onay durumundayken, otomatik olarak 'Onaylandı' durumu " +"ayarlanır. \n" +"* Satınalma siparişi yapıldı olarak ayarlandığında, otomatik olarak " +"'Yapıldı' durumu ayarlanır. \n" +"* Kullanıcı satınalma siparişini iptal ettiğinde, otomatik olarak 'İptal " +"edildi' durumu ayarlanır." #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." -msgstr "" +msgstr "Satınalma siparişi '%s' iptal edildi." #. module: purchase #: field:purchase.order,amount_total:0 @@ -1681,49 +1796,49 @@ msgstr "Toplam" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase msgid "Pricelist Versions" -msgstr "" +msgstr "Fiyat Listesi Sürümleri" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_supplier_address_form msgid "Addresses" -msgstr "" +msgstr "Adresler" #. module: purchase #: view:purchase.order.group:0 msgid "Are you sure you want to merge these orders ?" -msgstr "" +msgstr "Bu siparişleri birleştirmek istiyor musunuz?" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 #: view:purchase.report:0 msgid "Group By..." -msgstr "" +msgstr "...'ya Göre Grupla" #. module: purchase #: model:process.transition,name:purchase.process_transition_purchaseinvoice0 msgid "From a purchase order" -msgstr "" +msgstr "Satınalma siparişinden" #. module: purchase #: report:purchase.order:0 msgid "TVA :" -msgstr "" +msgstr "TVA :" #. module: purchase #: help:purchase.order,amount_total:0 msgid "The total amount" -msgstr "" +msgstr "Toplam tutar" #. module: purchase #: selection:purchase.report,month:0 msgid "May" -msgstr "" +msgstr "Mayıs" #. module: purchase #: field:res.company,po_lead:0 msgid "Purchase Lead Time" -msgstr "" +msgstr "Satınalma Tedarik Süresii" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0 @@ -1732,35 +1847,40 @@ msgid "" "order is 'On order'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"Satınalma siparişinin fatura kontrolü 'İşlemde' ise, fatura otomatik olarak " +"oluşturulur. Fatura hesap uzmanı tarafından manuel olarak da oluşturulabilir " +"(Fatura kontrolü = Manuel)." #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 msgid "Purchase" -msgstr "" +msgstr "Satınalma" #. module: purchase #: model:ir.model,name:purchase.model_res_partner #: field:purchase.order.line,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Ortak" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" "Please set one partner before choosing a product." msgstr "" +"Satınalma formunda bir ortak seçmeniz gerekir !\n" +"Lütfen bir ürün seçmeden önce bir ortak seçin." #. module: purchase #: view:purchase.installer:0 msgid "title" -msgstr "" +msgstr "başlık" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_move msgid "Partial Move" -msgstr "" +msgstr "Kısmi Hareket" #. module: purchase #: view:purchase.order.line:0 @@ -1771,12 +1891,12 @@ msgstr "Stok Hareketi" #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action msgid "Units of Measure" -msgstr "" +msgstr "Ölçü Birimleri" #. module: purchase #: view:purchase.report:0 msgid "Orders" -msgstr "" +msgstr "Siparişler" #. module: purchase #: help:purchase.order,name:0 @@ -1784,16 +1904,21 @@ msgid "" "unique number of the purchase order,computed automatically when the purchase " "order is created" msgstr "" +"özgün satınalma siparişi numarası, satınalma siparişi oluşturulduğunda " +"otomatik olarak belirlenir" #. module: purchase #: model:ir.actions.act_window,name:purchase.open_board_purchase #: model:ir.ui.menu,name:purchase.menu_board_purchase msgid "Purchase Dashboard" -msgstr "" +msgstr "Satınalma Performans Tablosu" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" +#~ msgid "From Picking" +#~ msgstr "İrsaliyeden" + #~ msgid "Confirmed Purchase" #~ msgstr "Onaylanan Alış" @@ -1901,3 +2026,6 @@ msgstr "" #~ msgid "Approving Purchase Order" #~ msgstr "Alış Sipariş Onaylaması" + +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "Satınalma Kalemleri Faturalandırılmadı" diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po index 506c358ecb5..19e5ee7b75c 100644 --- a/addons/purchase/i18n/uk.po +++ b/addons/purchase/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -222,7 +222,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -269,7 +269,7 @@ msgid "Notes" msgstr "Примітки" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -343,7 +343,7 @@ msgid "Cancelled" msgstr "Скасовано" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -397,7 +397,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -419,7 +419,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -436,8 +436,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -574,7 +574,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -683,7 +683,7 @@ msgid "Reservation Destination" msgstr "Ціль резервування" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -761,7 +761,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -772,7 +772,7 @@ msgid "Manual" msgstr "Ручний" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -886,7 +886,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -939,7 +938,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1083,7 +1088,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1100,14 +1105,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1154,7 +1159,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1420,7 +1425,7 @@ msgid "Date Approved" msgstr "Затверджена дата" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1532,7 +1537,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1676,7 +1681,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1753,7 +1758,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1799,16 +1804,6 @@ msgstr "" msgid "Purchase Dashboard" msgstr "" -#~ msgid "" -#~ "Please note that orders will only be merged if they are to the same partner " -#~ "and going to the same location, and lines will only be merged if they are " -#~ "exactly the same except for the quantity and unit." -#~ msgstr "" -#~ "Зауваження. Замовлення будуть об'єднані лище тоді, коли вони відносяться до " -#~ "одного партнера і направляються до одного пункту призначення. Рядки будуть " -#~ "об'єднані лише тоді, коли вони співпадають у всьому, крім кількості та " -#~ "одиниці виміру." - #~ msgid "Purchase Orders in Progress" #~ msgstr "Заявка на придбання в обробці" diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po index d385b0a9844..a893294e197 100644 --- a/addons/purchase/i18n/vi.po +++ b/addons/purchase/i18n/vi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-07 20:56+0000\n" +"PO-Revision-Date: 2011-07-31 06:20+0000\n" "Last-Translator: Phong Nguyen-Thanh <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: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -25,7 +25,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -43,7 +43,7 @@ msgid "Destination" msgstr "Điểm đến" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -70,7 +70,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -112,7 +112,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -135,7 +135,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -221,7 +221,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -268,7 +268,7 @@ msgid "Notes" msgstr "Ghi chú" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -309,7 +309,7 @@ msgstr "Số tham chiếu đơn hàng" #. module: purchase #: report:purchase.order:0 msgid "Net Total :" -msgstr "Tổng số thực:" +msgstr "Tổng số thực :" #. module: purchase #: view:purchase.installer:0 @@ -342,7 +342,7 @@ msgid "Cancelled" msgstr "Đã hủy bỏ" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -396,7 +396,7 @@ msgid "Reference" msgstr "Tham chiếu" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -418,7 +418,7 @@ msgid "Day" msgstr "Ngày" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -435,8 +435,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -493,7 +493,7 @@ msgstr "Giá trung bình" #. module: purchase #: report:purchase.order:0 msgid "Total :" -msgstr "Tổng số:" +msgstr "Tổng :" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 @@ -573,7 +573,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -682,7 +682,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "Hành động không hợp lệ!" @@ -760,7 +760,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -771,7 +771,7 @@ msgid "Manual" msgstr "Thủ công" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -885,7 +885,6 @@ msgid "Month" msgstr "Tháng" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -938,7 +937,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1082,7 +1087,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1099,14 +1104,14 @@ msgid "Extended Filters..." msgstr "Bộ lọc mở rộng..." #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1153,7 +1158,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1413,7 +1418,7 @@ msgid "Date Approved" msgstr "Ngày được chấp thuận" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1525,7 +1530,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1669,7 +1674,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1746,7 +1751,7 @@ msgid "Partner" msgstr "Đối tác" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" @@ -1795,21 +1800,12 @@ msgstr "" #~ msgid "Invalid model name in the action definition." #~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động." -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !" - #~ msgid "You cannot have 2 pricelist versions that overlap!" #~ msgstr "Bạn không thể có 2 phiên bản bảng giá chồng chéo nhau!" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!" -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy." - -#~ msgid "The name of the group must be unique !" -#~ msgstr "Tên nhóm phải duy nhất !" - #~ msgid "" #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList " #~ "Item!" @@ -1817,17 +1813,8 @@ msgstr "" #~ "Lỗi! Bạn không thể chỉ định bảng giá chính là bảng giá khác trong các mục " #~ "bảng giá!" -#~ msgid "The name of the module must be unique !" -#~ msgstr "Tên của mô đun phải duy nhất !" - #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" #~ msgstr "" #~ "Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc " #~ "biệt nào!" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !" - -#~ msgid "Product UoM" -#~ msgstr "Đơn vị đo của sản phẩm" diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po index 0c8e026da5d..c93a7827abf 100644 --- a/addons/purchase/i18n/zh_CN.po +++ b/addons/purchase/i18n/zh_CN.po @@ -13,26 +13,26 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." -msgstr "RFQ 必须先得到采购经理确认才能发给供货方。 RFQ 即成为确认的采购订单。" +msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商。 询价单能确认为采购订单。" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." -msgstr "采购订单无明细，你无权确认。" +msgstr "采购订单无明细，您不能确认。" #. module: purchase #: field:purchase.order,invoiced:0 msgid "Invoiced & Paid" -msgstr "已开票并付清" +msgstr "已开票 & 付清" #. module: purchase #: field:purchase.order,location_id:0 @@ -42,17 +42,17 @@ msgid "Destination" msgstr "目的地" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" -msgstr "" +msgstr "您选择的产品计量单位要与该产品的采购单位同一的类型。" #. module: purchase #: help:purchase.report,date:0 msgid "Date on which this document has been created" -msgstr "文件生成日期" +msgstr "单据生成日期" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -66,11 +66,13 @@ msgid "" "supplier invoices: based on the order, based on the receptions or manual " "encoding." msgstr "" +"当您还没确认采购时您可以先创建一个询价单。询价单基于您的物料规则 (最少库存，MTO(按单生产)等) " +"自动创建。您能把询价确认后转为采购订单。如果您使用扩展接口(在用户偏好里)，您能选择控制供应商的开票方式：基于该订单，基于接收或者手动。" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" -msgstr "来自领料/提货" +msgid "From Reception" +msgstr "" #. module: purchase #: view:purchase.order:0 @@ -100,7 +102,7 @@ msgstr "供应商" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Do you want to generate the supplier invoices ?" -msgstr "生成供货发票吗？" +msgstr "生成供应商发票吗？" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action @@ -108,19 +110,19 @@ msgid "" "Use this menu to search within your purchase orders by references, supplier, " "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." -msgstr "" +msgstr "使用这菜单按单号，供应商，产品等搜索您的采购订单，您可以跟踪接收的产品和控制供应商的发票。" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "选择的供应商只销售这产品 %s" #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:156 #, python-format msgid "Supplier Invoices" -msgstr "供货发票" +msgstr "供应商发票" #. module: purchase #: sql_constraint:purchase.order:0 @@ -131,10 +133,10 @@ msgstr "单号必须唯一！" #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "来源自分拣单" +msgstr "来自装箱单" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "没有价格表！" @@ -149,7 +151,7 @@ msgstr "数量" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Select an Open Sale Order" -msgstr "选择一个打开的销售订单" +msgstr "选择待处理的销售订单" #. module: purchase #: field:purchase.order,company_id:0 @@ -164,7 +166,7 @@ msgstr "公司" #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph #: view:purchase.report:0 msgid "Monthly Purchase by Category" -msgstr "每个种类采购的月汇总" +msgstr "采购按月分类" #. module: purchase #: view:purchase.order:0 @@ -185,7 +187,7 @@ msgstr "默认采购价格表" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_current_purchases msgid "Current purchases" -msgstr "正在进行的采购" +msgstr "当前的采购" #. module: purchase #: help:purchase.order,dest_address_id:0 @@ -193,14 +195,14 @@ msgid "" "Put an address if you want to deliver directly from the supplier to the " "customer.In this case, it will remove the warehouse link and set the " "customer location." -msgstr "如果你想直接从供应商送货到客户填入地址.这个业务个案它将删除与仓库的连接并设置客户地址" +msgstr "如果您想直接从供应商送货到客户，请填入地址。在这情况下它将删除仓库链接并设定客户库位。" #. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 msgid "" "This pricelist will be used, instead of the default one, for purchases from " "the current partner" -msgstr "这价格表将用于当前业务伙伴采购的价格表而不是默认的价格表" +msgstr "这价格表将替代当前业务伙伴采购的默认价格表" #. module: purchase #: report:purchase.order:0 @@ -212,15 +214,15 @@ msgstr "传真 ：" msgid "" "The pricelist sets the currency used for this purchase order. It also " "computes the supplier price for the selected products/quantities." -msgstr "采购订单使用的价格表.它还计算选定产品的供应商价格/数量" +msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking" -msgstr "部分交货" +msgstr "部分装箱单" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "采购订单 '%s' 已经确认。" @@ -228,7 +230,7 @@ msgstr "采购订单 '%s' 已经确认。" #. module: purchase #: view:purchase.order:0 msgid "Approve Purchase" -msgstr "批准采购" +msgstr "审批采购" #. module: purchase #: model:process.node,name:purchase.process_node_approvepurchaseorder0 @@ -236,27 +238,27 @@ msgstr "批准采购" #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Approved" -msgstr "已通过" +msgstr "已审批" #. module: purchase #: view:purchase.report:0 msgid "Reference UOM" -msgstr "相关计量单位" +msgstr "计量单位" #. module: purchase #: view:purchase.order:0 msgid "Origin" -msgstr "原产地" +msgstr "来源" #. module: purchase #: field:purchase.report,product_uom:0 msgid "Reference UoM" -msgstr "相关计量单位" +msgstr "计量单位" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree msgid "Purchases" -msgstr "采购单" +msgstr "采购订单" #. module: purchase #: view:purchase.order:0 @@ -267,19 +269,17 @@ msgid "Notes" msgstr "备注" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" "Please set one before choosing a product." -msgstr "" -"请先从采购单里选择一个价格表或者供应商！\n" -"然后再选择产品。" +msgstr "请在采购界面选择价格表或供应商！然后再选择产品。" #. module: purchase #: selection:purchase.report,month:0 msgid "September" -msgstr "九月" +msgstr "9月" #. module: purchase #: report:purchase.order:0 @@ -287,7 +287,7 @@ msgstr "九月" #: view:purchase.order.line:0 #: field:purchase.order.line,taxes_id:0 msgid "Taxes" -msgstr "税金" +msgstr "税" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_order @@ -305,17 +305,17 @@ msgstr "采购订单" #: view:purchase.order.line:0 #: field:purchase.order.line,order_id:0 msgid "Order Reference" -msgstr "订单引用" +msgstr "单号" #. module: purchase #: report:purchase.order:0 msgid "Net Total :" -msgstr "净总额：" +msgstr "净合计:" #. module: purchase #: view:purchase.installer:0 msgid "Configure Your Purchases Management Application" -msgstr "配置您的采购管理应用" +msgstr "设置您的采购管理应用" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product @@ -326,14 +326,14 @@ msgstr "产品" #. module: purchase #: field:purchase.installer,progress:0 msgid "Configuration Progress" -msgstr "配置进度" +msgstr "设置进度" #. module: purchase #: model:process.transition,note:purchase.process_transition_packinginvoice0 msgid "" "A Pick list generates an invoice. Depending on the Invoicing control of the " "sale order, the invoice is based on delivered or on ordered quantities." -msgstr "领货清单，根据订货或者交货数量，再生成发票。" +msgstr "装箱单生成发票，销售订单控制生成的发票，发票是基于已交付或已经下单的数量。" #. module: purchase #: selection:purchase.order,state:0 @@ -343,10 +343,10 @@ msgid "Cancelled" msgstr "已取消" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" -msgstr "采购金额超过限额" +msgstr "采购金额超过限定" #. module: purchase #: view:purchase.order:0 @@ -374,12 +374,12 @@ msgstr "发票明细" #: model:process.node,name:purchase.process_node_packinglist0 #: model:process.node,name:purchase.process_node_productrecept0 msgid "Incoming Products" -msgstr "入库货品" +msgstr "接收的产品" #. module: purchase #: model:process.node,name:purchase.process_node_packinginvoice0 msgid "Outgoing Products" -msgstr "出库货品" +msgstr "发出的产品" #. module: purchase #: view:purchase.order:0 @@ -389,15 +389,15 @@ msgstr "手动更正" #. module: purchase #: view:purchase.report:0 msgid " Month " -msgstr " 月 " +msgstr " 月份 " #. module: purchase #: view:purchase.order:0 msgid "Reference" -msgstr "引用" +msgstr "单号" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "无法删除 %s 状态的采购订单" @@ -405,7 +405,7 @@ msgstr "无法删除 %s 状态的采购订单" #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "目的地址联系人名" +msgstr "目的地址联系人姓名" #. module: purchase #: model:ir.model,name:purchase.model_stock_move @@ -419,25 +419,25 @@ msgid "Day" msgstr "天" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." -msgstr "采购单“%s”已经设为草稿" +msgstr "采购订单 “%s” 已经设为草稿" #. module: purchase #: field:purchase.order.line,account_analytic_id:0 msgid "Analytic Account" -msgstr "辅助核算项目" +msgstr "辅助核算项" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,nbr:0 msgid "# of Lines" -msgstr "笔明细" +msgstr "# 明细" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -471,13 +471,13 @@ msgstr "采购订单明细" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "这表示装箱单已完成" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" -msgstr "错误的货品计量单位！" +msgstr "错误的产品计量单位！" #. module: purchase #: model:process.node,name:purchase.process_node_confirmpurchaseorder0 @@ -506,7 +506,7 @@ msgstr "确认" #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice #: view:purchase.order:0 msgid "Invoice Control" -msgstr "发票控制" +msgstr "发票管理" #. module: purchase #: constraint:res.company:0 @@ -516,12 +516,12 @@ msgstr "错误！您不能创建递归公司." #. module: purchase #: field:purchase.order,partner_ref:0 msgid "Supplier Reference" -msgstr "供应商参考" +msgstr "供应商单号" #. module: purchase #: help:purchase.order,amount_tax:0 msgid "The tax amount" -msgstr "税额" +msgstr "税金" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -529,7 +529,7 @@ msgid "" "A Pick list generates a supplier invoice. Depending on the Invoicing control " "of the purchase order, the invoice is based on received or on ordered " "quantities." -msgstr "" +msgstr "装箱单生成供应商发票。采购订单控制发票，发票是基于已接收或已下单数量。" #. module: purchase #: view:purchase.order:0 @@ -545,7 +545,7 @@ msgstr "状态" msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." -msgstr "" +msgstr "接收分析使您轻松检查和分析您公司订单的接收数量和您供应商交货的特性。" #. module: purchase #: report:purchase.quotation:0 @@ -556,7 +556,7 @@ msgstr "电话:" #: model:ir.model,name:purchase.model_stock_picking #: field:purchase.order,picking_ids:0 msgid "Picking List" -msgstr "分拣单" +msgstr "装箱单" #. module: purchase #: view:purchase.order:0 @@ -566,7 +566,7 @@ msgstr "打印" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group msgid "Merge Purchase orders" -msgstr "" +msgstr "合并采购订单" #. module: purchase #: field:purchase.order,order_line:0 @@ -574,10 +574,10 @@ msgid "Order Lines" msgstr "订单明细" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" -msgstr "缺少业务伙伴！" +msgstr "没业务伙伴！" #. module: purchase #: report:purchase.quotation:0 @@ -616,16 +616,19 @@ msgid "" "Manual: allows you to generate suppliers invoices by chosing in the " "uninvoiced lines of all manual purchase orders." msgstr "" +"来自订单：发票草稿根据采购订单预先生成。会计人员对发票的控制只需确认。\n" +"来自装箱单：发票草稿根据已确认的收货单预先生成。\n" +"手动：允许您在所有未开票的采购订单的明细中挑选生成供应商发票。" #. module: purchase #: help:purchase.order,invoice_ids:0 msgid "Invoices generated for a purchase order" -msgstr "采购单的发票已生成" +msgstr "采购订单的发票已开" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -639,7 +642,7 @@ msgstr "一般信息" #. module: purchase #: view:board.board:0 msgid "My Board" -msgstr "我的面板" +msgstr "我的控制台" #. module: purchase #: report:purchase.order:0 @@ -652,7 +655,7 @@ msgid "" "Purchase Analysis allows you to easily check and analyse your company " "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your suppliers, etc." -msgstr "" +msgstr "采购分析使您轻松检查和分析您公司的采购日志和特性，在这菜单您能跟踪您协商的特性和您供应商送货的特性等。" #. module: purchase #: view:purchase.order:0 @@ -665,7 +668,7 @@ msgid "" "The invoice is created automatically if the Invoice control of the purchase " "order is 'On picking'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." -msgstr "" +msgstr "如果这采购订单的发票控制是“来自装箱单”发票将自动生成。发票也可以是会计人员手工生成(发票控制 = 手动)。" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -683,7 +686,7 @@ msgid "Reservation Destination" msgstr "预定目的地" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "无效动作！" @@ -698,13 +701,13 @@ msgstr "完成" #. module: purchase #: selection:purchase.report,month:0 msgid "July" -msgstr "七月" +msgstr "7月" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase #: view:res.company:0 msgid "Configuration" -msgstr "配置" +msgstr "设置" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier @@ -715,18 +718,18 @@ msgstr "按供应商汇总采购" #. module: purchase #: view:purchase.order:0 msgid "Total amount" -msgstr "金额合计" +msgstr "总金额" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking msgid "Receptions" -msgstr "" +msgstr "接收" #. module: purchase #: field:purchase.order,validator:0 #: view:purchase.report:0 msgid "Validated by" -msgstr "审核人:" +msgstr "审核人" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_invoice_pending @@ -736,6 +739,7 @@ msgid "" "according to your settings. Once you receive a supplier invoice, you can " "match it with the draft invoice and validate it." msgstr "" +"使用这菜单控制您从供应商收到的发票。系统根据您的设定从您的采购订单或收货生成发票草稿。一旦您收到供应商的发票，您可以匹配发票的草稿并审核它。" #. module: purchase #: model:process.node,name:purchase.process_node_draftpurchaseorder0 @@ -746,25 +750,25 @@ msgstr "询价单" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice msgid "Supplier Invoices to Receive" -msgstr "" +msgstr "接收到的供应商发票" #. module: purchase #: help:purchase.installer,purchase_requisition:0 msgid "" "Manages your Purchase Requisition and allows you to easily keep track and " "manage all your purchase orders." -msgstr "" +msgstr "管理您的采购申请和使您轻松跟踪和管理您所有的采购订单" #. module: purchase #: view:purchase.report:0 msgid " Month-1 " -msgstr "" +msgstr " 上月 " #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" -msgstr "" +msgstr "公司没定义这采购账簿：\"%s\" (id:%d)" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -772,10 +776,10 @@ msgid "Manual" msgstr "手动" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." -msgstr "" +msgstr "您必须先取消这采购订单的所有装箱单。" #. module: purchase #: view:purchase.order:0 @@ -787,17 +791,17 @@ msgstr "订单日期" #. module: purchase #: model:process.node,note:purchase.process_node_productrecept0 msgid "Incoming products to control" -msgstr "" +msgstr "控制接收的产品" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 msgid "Approbation" -msgstr "" +msgstr "审批" #. module: purchase #: view:purchase.report:0 msgid "Purchase Orders Statistics" -msgstr "订货单统计数据" +msgstr "采购订单统计" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2 @@ -807,6 +811,7 @@ msgid "" "supplier invoice yet. Once you are ready to receive a supplier invoice, you " "can generate a draft supplier invoice based on the lines from this menu." msgstr "" +"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细生成发票草稿。" #. module: purchase #: model:process.node,name:purchase.process_node_invoiceafterpacking0 @@ -817,19 +822,19 @@ msgstr "发票草稿" #. module: purchase #: help:purchase.installer,purchase_analytic_plans:0 msgid "Manages analytic distribution and purchase orders." -msgstr "" +msgstr "管理分析配送和采购订单" #. module: purchase #: help:purchase.order,minimum_planned_date:0 msgid "" "This is computed as the minimum scheduled date of all purchase order lines' " "products." -msgstr "这是计算手动采购单产品的最小计划日期" +msgstr "计算所有采购订单明细产品的最小计划日期" #. module: purchase #: selection:purchase.report,month:0 msgid "August" -msgstr "八月" +msgstr "8月" #. module: purchase #: field:purchase.installer,purchase_requisition:0 @@ -839,62 +844,61 @@ msgstr "采购申请" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "计量单位类别" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "交付日期" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory msgid "Receive Products" -msgstr "" +msgstr "收货" #. module: purchase #: model:ir.model,name:purchase.model_procurement_order msgid "Procurement" -msgstr "请料单" +msgstr "需求单" #. module: purchase #: view:purchase.order:0 #: field:purchase.order,invoice_ids:0 msgid "Invoices" -msgstr "发票列表" +msgstr "发票" #. module: purchase #: model:process.node,note:purchase.process_node_purchaseorder0 msgid "Confirmed purchase order to invoice" -msgstr "" +msgstr "已确认采购订单要开发票" #. module: purchase #: field:purchase.installer,config_logo:0 msgid "Image" -msgstr "图片" +msgstr "图像" #. module: purchase #: view:purchase.report:0 msgid "Total Orders Lines by User per month" -msgstr "" +msgstr "按用户每月的订单明细汇总" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,month:0 msgid "Month" -msgstr "月" +msgstr "月份" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" -msgstr "" +msgstr "等该供应商回复" #. module: purchase #: report:purchase.quotation:0 msgid "Request for Quotation :" -msgstr "询价:" +msgstr "询价单:" #. module: purchase #: view:board.board:0 @@ -905,24 +909,24 @@ msgstr "等待审批的采购订单" #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" -msgstr "" +msgstr "总未完税金额" #. module: purchase #: field:purchase.order,shipped:0 #: field:purchase.order,shipped_rate:0 msgid "Received" -msgstr "已收货" +msgstr "已接收" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "采购的产品" #. module: purchase #: help:purchase.order,picking_ids:0 msgid "" "This is the list of picking list that have been generated for this purchase" -msgstr "从领料/提货中产生采购" +msgstr "这采购已生成装箱单" #. module: purchase #: model:ir.module.module,shortdesc:purchase.module_meta_information @@ -934,12 +938,18 @@ msgstr "采购管理" #: model:process.node,note:purchase.process_node_invoiceafterpacking0 #: model:process.node,note:purchase.process_node_invoicecontrol0 msgid "To be reviewed by the accountant." -msgstr "" +msgstr "等待会计复核。" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -951,7 +961,7 @@ msgstr "税:" #: field:purchase.order,invoiced_rate:0 #: field:purchase.order.line,invoiced:0 msgid "Invoiced" -msgstr "开发票" +msgstr "已开票" #. module: purchase #: view:purchase.report:0 @@ -963,12 +973,12 @@ msgstr "分类" #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 msgid "State of the Purchase Order." -msgstr "采购单状态" +msgstr "采购订单状态" #. module: purchase #: view:purchase.report:0 msgid " Year " -msgstr "" +msgstr " 年 " #. module: purchase #: field:purchase.report,state:0 @@ -990,7 +1000,7 @@ msgstr "采购订单明细" #. module: purchase #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "错误！您不能创建递归的相关成员。" +msgstr "错误！您不能创建递归的协会会员。" #. module: purchase #: view:purchase.order:0 @@ -1000,23 +1010,23 @@ msgstr "日程表视图" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_group msgid "Purchase Order Merge" -msgstr "采购单合并" +msgstr "采购订单合并" #. module: purchase #: report:purchase.quotation:0 msgid "Regards," -msgstr "问候" +msgstr "尊敬的" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier #: view:purchase.report:0 msgid "Negotiation by Supplier" -msgstr "" +msgstr "供应商协商" #. module: purchase #: view:res.partner:0 msgid "Purchase Properties" -msgstr "" +msgstr "采购属性" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1024,7 +1034,7 @@ msgid "" "A purchase order generates a supplier invoice, as soon as it is confirmed by " "the buyer. Depending on the Invoicing control of the purchase order, the " "invoice is based on received or on ordered quantities." -msgstr "" +msgstr "一旦买方确认根据采购订单开发票，一个采购订单生成一个供应商发票，发票根据已收到或已下单的数量。" #. module: purchase #: field:purchase.order,amount_untaxed:0 @@ -1034,48 +1044,48 @@ msgstr "未完税金额" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "这表明发票已支付" #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 msgid "Outgoing products to invoice" -msgstr "" +msgstr "出仓产品要开发票" #. module: purchase #: view:purchase.installer:0 msgid "Configure" -msgstr "配置" +msgstr "设置" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_qty_per_product #: view:purchase.report:0 msgid "Qty. per product" -msgstr "" +msgstr "Qty. per product" #. module: purchase #: constraint:stock.move:0 msgid "You try to assign a lot which is not from the same product" -msgstr "" +msgstr "您尝试为不同的产品分配批次" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "文档的创建日期" +msgstr "单据的创建日期" #. module: purchase #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "销售与采购" +msgstr "销售&采购" #. module: purchase #: selection:purchase.report,month:0 msgid "June" -msgstr "" +msgstr "6月" #. module: purchase #: model:ir.model,name:purchase.model_purchase_report msgid "Purchases Orders" -msgstr "采购单列表" +msgstr "采购订单" #. module: purchase #: view:purchase.order.line:0 @@ -1083,31 +1093,31 @@ msgid "Manual Invoices" msgstr "手工发票" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" -msgstr "" +msgstr "有人刚确认一个超过默认限定金额的采购" #. module: purchase #: selection:purchase.report,month:0 msgid "November" -msgstr "十一月" +msgstr "11月" #. module: purchase #: view:purchase.report:0 msgid "Extended Filters..." -msgstr "扩展过滤器..." +msgstr "增加筛选条件" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" -msgstr "" +msgstr "未定义此产品“%s“ (id:%d)的费用科目" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "您必须先取消掉附加到此采购订单上的所有发票。" @@ -1116,12 +1126,12 @@ msgstr "您必须先取消掉附加到此采购订单上的所有发票。" #: code:addons/purchase/wizard/purchase_order_group.py:48 #, python-format msgid "Please select multiple order to merge in the list view." -msgstr "请在此列表中选择多条待合并的订单" +msgstr "请在此列表中选择多张待合并的订单" #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 msgid "Pick list generated" -msgstr "" +msgstr "生成装箱单" #. module: purchase #: view:purchase.order:0 @@ -1131,7 +1141,7 @@ msgstr "异常" #. module: purchase #: selection:purchase.report,month:0 msgid "October" -msgstr "十月" +msgstr "10月" #. module: purchase #: view:purchase.order:0 @@ -1152,24 +1162,32 @@ msgid "" "\n" " " msgstr "" +"\n" +" 采购模块是向供应商采购产品生成采购订单。\n" +" 从采购订单创建供应商发票\n" +" 采购管理的控制台包括：\n" +" 当前的采购订单\n" +" 每月的数量和金额图表 \n" +"\n" +" " #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " "less." -msgstr "" +msgstr "这选定的供应商设定的最少采购数量为 %s，您不能采购少了。" #. module: purchase #: selection:purchase.report,month:0 msgid "January" -msgstr "一月" +msgstr "1月" #. module: purchase #: model:ir.model,name:purchase.model_res_company msgid "Companies" -msgstr "" +msgstr "公司" #. module: purchase #: view:purchase.order:0 @@ -1179,40 +1197,40 @@ msgstr "取消采购订单" #. module: purchase #: constraint:stock.move:0 msgid "You must assign a production lot for this product" -msgstr "" +msgstr "必须为此产品赋予一个生产批次" #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 msgid "A pick list is generated to track the incoming products." -msgstr "" +msgstr "生成装箱单用来跟踪入库的产品" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard msgid "Dashboard" -msgstr "仪表盘" +msgstr "控制台" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_standard:0 msgid "Products Value" -msgstr "货品价值" +msgstr "产品价值" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type msgid "Pricelists Types" -msgstr "" +msgstr "价格表类型" #. module: purchase #: view:purchase.order:0 #: view:purchase.report:0 msgid "Quotations" -msgstr "报价单" +msgstr "询价单" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree #: view:purchase.report:0 msgid "Purchase order per month" -msgstr "" +msgstr "每月的采购订单" #. module: purchase #: view:purchase.order.line:0 @@ -1222,18 +1240,18 @@ msgstr "日志" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form msgid "Products by Category" -msgstr "" +msgstr "产品分类" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay:0 msgid "Days to Validate" -msgstr "" +msgstr "审核日期" #. module: purchase #: help:purchase.order,origin:0 msgid "Reference of the document that generated this purchase order request." -msgstr "参考的文档生成这个采购订单请求" +msgstr "生成这采购订单申请的相关单据" #. module: purchase #: help:purchase.order,state:0 @@ -1245,8 +1263,12 @@ msgid "" "received, the state becomes 'Done'. If a cancel action occurs in the invoice " "or in the reception of goods, the state becomes in exception." msgstr "" -"采购订单或询价的状态.询价是一个采购订单的‘草稿’状态.订单被用户确定为‘已确认’状态.然后订单的供应商必须被确定这时状态改为为‘已审批通过’.当采购订单" -"支付和已收货,状态变为‘完成’.如果在发票或接收产品时执行取消操作,状态将变为‘异常’." +"采购订单或询价单的状态。\r\n" +" 询价单是采购订单的‘草稿’状态。\r\n" +"订单被用户确认为‘已确认’状态。\r\n" +"然后订单的供应商必须确认这时状态改为为‘已审批’。 \r\n" +"当采购订单支付和已收货状态变为‘完成’。 \r\n" +"如果在开发票或接收产品时执行取消操作状态将变为‘异常’。" #. module: purchase #: field:purchase.order.line,price_subtotal:0 @@ -1262,7 +1284,7 @@ msgstr "询价单" #. module: purchase #: help:purchase.order,date_approve:0 msgid "Date on which purchase order has been approved" -msgstr "采购单被批准的日期" +msgstr "采购订单审批日期" #. module: purchase #: selection:purchase.order,state:0 @@ -1279,13 +1301,13 @@ msgstr "默认采购价格表版本" #: view:purchase.installer:0 msgid "" "Extend your Purchases Management Application with additional functionalities." -msgstr "" +msgstr "扩展您采购管理应用并增加功能" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_install_module #: view:purchase.installer:0 msgid "Purchases Application Configuration" -msgstr "采购管理应用程序配置" +msgstr "采购应用设置" #. module: purchase #: field:purchase.order,fiscal_position:0 @@ -1306,7 +1328,7 @@ msgstr "发票" #. module: purchase #: selection:purchase.report,month:0 msgid "December" -msgstr "十二月" +msgstr "12月" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0 @@ -1326,7 +1348,7 @@ msgstr "采购订单明细" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 msgid "The supplier approves the Purchase Order." -msgstr "供应商批准该采购单。" +msgstr "供应商审批了这采购订单。" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -1349,17 +1371,17 @@ msgstr "合并采购订单" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line_invoice msgid "Purchase Order Line Make Invoice" -msgstr "" +msgstr "采购订单明细生成发票" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 msgid "Incoming Shipments" -msgstr "" +msgstr "入库" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all msgid "Total Orders by User per month" -msgstr "" +msgstr "按用户每月的订单总金额" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation @@ -1383,13 +1405,13 @@ msgstr "负责人" #. module: purchase #: report:purchase.order:0 msgid "Our Order Reference" -msgstr "订单参考" +msgstr "我相关的订单" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Search Purchase Order" -msgstr "搜索采购单" +msgstr "搜索采购订单" #. module: purchase #: field:purchase.order,warehouse_id:0 @@ -1402,7 +1424,7 @@ msgstr "仓库" #: model:process.node,note:purchase.process_node_draftpurchaseorder0 #: model:process.node,note:purchase.process_node_draftpurchaseorder1 msgid "Request for Quotations." -msgstr "询价请求" +msgstr "询价单" #. module: purchase #: report:purchase.order:0 @@ -1413,10 +1435,10 @@ msgstr "要求日期" #: field:purchase.order,date_approve:0 #: field:purchase.report,date_approve:0 msgid "Date Approved" -msgstr "通过日期" +msgstr "审批日期" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "无法取消此采购订单！" @@ -1430,12 +1452,12 @@ msgstr "单价" #. module: purchase #: view:purchase.order:0 msgid "Delivery & Invoicing" -msgstr "货运与开票" +msgstr "交付 & 开发票" #. module: purchase #: field:purchase.order.line,date_planned:0 msgid "Scheduled Date" -msgstr "预定日期" +msgstr "计划日期" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase @@ -1463,12 +1485,12 @@ msgstr "说明" #. module: purchase #: help:res.company,po_lead:0 msgid "This is the leads/security time for each purchase order." -msgstr "" +msgstr "这是每个采购订单的备货/安全保障时间。" #. module: purchase #: report:purchase.quotation:0 msgid "Expected Delivery address:" -msgstr "预期交货地址:" +msgstr "预定交货地址:" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po @@ -1479,7 +1501,7 @@ msgstr "收货分析" #. module: purchase #: help:purchase.order,amount_untaxed:0 msgid "The amount without tax" -msgstr "" +msgstr "不含税金额" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_supplier_address_form @@ -1487,18 +1509,18 @@ msgid "" "Access your supplier records and maintain a good relationship with your " "suppliers. You can track all your interactions with them through the History " "tab: emails, orders, meetings, etc." -msgstr "" +msgstr "访问您的供应商的记录与您的供应商保持良好的关系。通过日志标签您能跟踪您所有与供应商的互动：电子邮件，订单，会议等。" #. module: purchase #: view:purchase.order:0 msgid "Delivery" -msgstr "送货" +msgstr "交付" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_draft msgid "Request for Quotations" -msgstr "" +msgstr "询价单" #. module: purchase #: field:purchase.order.line,product_uom:0 @@ -1525,10 +1547,10 @@ msgstr "预定" #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph #: view:purchase.report:0 msgid "Total Qty and Amount by month" -msgstr "数量和金额的月汇总" +msgstr "按月度的总数量和总金额" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "无法取消采购订单！" @@ -1538,28 +1560,28 @@ msgstr "无法取消采购订单！" msgid "" "In case there is no supplier for this product, the buyer can fill the form " "manually and confirm it. The RFQ becomes a confirmed Purchase Order." -msgstr "" +msgstr "在这业务产品没有供应商，买方可以手动填写并确认。这询价单能通过确认转换为采购订单。" #. module: purchase #: selection:purchase.report,month:0 msgid "February" -msgstr "二月" +msgstr "2月" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase msgid "Products Categories" -msgstr "" +msgstr "产品分类" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all msgid "Purchase Analysis" -msgstr "" +msgstr "采购分析" #. module: purchase #: report:purchase.order:0 msgid "Your Order Reference" -msgstr "你订单参考" +msgstr "您的订单" #. module: purchase #: view:purchase.order:0 @@ -1573,7 +1595,7 @@ msgstr "预计日期" #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state #: view:purchase.report:0 msgid "Total price by product by state" -msgstr "" +msgstr "该状态下产品的总价格" #. module: purchase #: report:purchase.quotation:0 @@ -1584,7 +1606,7 @@ msgstr "增值税:" #: report:purchase.order:0 #: field:purchase.order,date_order:0 msgid "Date Ordered" -msgstr "订购日期" +msgstr "下单日期" #. module: purchase #: report:purchase.order:0 @@ -1599,12 +1621,12 @@ msgstr "采购控制" #. module: purchase #: selection:purchase.report,month:0 msgid "March" -msgstr "三月" +msgstr "3月" #. module: purchase #: selection:purchase.report,month:0 msgid "April" -msgstr "四月" +msgstr "4月" #. module: purchase #: view:purchase.order.group:0 @@ -1621,6 +1643,15 @@ msgid "" "\n" " " msgstr "" +" 请注意：\n" +"订单将被合并如果：\n" +" * 采购订单在草稿状态\n" +" * 采购订单有相同的供应商\n" +" * 采购订单有相同的仓库库位，相同的价格表\n" +"\n" +"只合并明细如果：\n" +" * 订单明细刚好产品相同 \n" +" " #. module: purchase #: view:purchase.report:0 @@ -1631,7 +1662,7 @@ msgstr "年" #. module: purchase #: field:purchase.report,negociation:0 msgid "Purchase-Standard Price" -msgstr "" +msgstr "采购 - 标准单价" #. module: purchase #: model:product.pricelist.type,name:purchase.pricelist_type_purchase @@ -1647,17 +1678,17 @@ msgstr "开票方式" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0 msgid "Approve" -msgstr "通过" +msgstr "审批" #. module: purchase #: view:purchase.order:0 msgid "To Approve" -msgstr "待批准" +msgstr "待审批" #. module: purchase #: view:purchase.order.line:0 msgid "Invoicing" -msgstr "发票" +msgstr "开发票" #. module: purchase #: help:purchase.order.line,state:0 @@ -1670,12 +1701,16 @@ msgid "" " \n" "* The 'Cancelled' state is set automatically when user cancel purchase order." msgstr "" +" “草稿”状态当采购订单在草稿状态是自动设置\n" +"“已确认”状态当采购订单在确认状态时自动设置为确认\n" +"“已完成”状态当采购订单完成自动设置\n" +"“已取消”状态当用户取消采购订单时自动设置" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." -msgstr "采购单“%s”已经取消" +msgstr "采购订单 “%s” 已经取消" #. module: purchase #: field:purchase.order,amount_total:0 @@ -1702,12 +1737,12 @@ msgstr "你确定要合并此订单吗？" #: view:purchase.order.line:0 #: view:purchase.report:0 msgid "Group By..." -msgstr "分组于" +msgstr "分组..." #. module: purchase #: model:process.transition,name:purchase.process_transition_purchaseinvoice0 msgid "From a purchase order" -msgstr "" +msgstr "从采购订单" #. module: purchase #: report:purchase.order:0 @@ -1717,12 +1752,12 @@ msgstr "增值税:" #. module: purchase #: help:purchase.order,amount_total:0 msgid "The total amount" -msgstr "总价" +msgstr "总金额" #. module: purchase #: selection:purchase.report,month:0 msgid "May" -msgstr "五月" +msgstr "5月" #. module: purchase #: field:res.company,po_lead:0 @@ -1735,7 +1770,7 @@ msgid "" "The invoice is created automatically if the Invoice control of the purchase " "order is 'On order'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." -msgstr "" +msgstr "如果采购订单的发票控制是“来自订单”发票是自动生成。发票也可以由会计人员手动产生(发票控制 = 手动)" #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 @@ -1749,22 +1784,24 @@ msgid "Partner" msgstr "业务伙伴" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" "Please set one partner before choosing a product." msgstr "" +"您必须在采购订单里选择业务伙伴！\n" +"请在选定产品前设定一个业务伙伴" #. module: purchase #: view:purchase.installer:0 msgid "title" -msgstr "" +msgstr "标题" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_move msgid "Partial Move" -msgstr "" +msgstr "部分调拨" #. module: purchase #: view:purchase.order.line:0 @@ -1775,7 +1812,7 @@ msgstr "库存调拨" #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action msgid "Units of Measure" -msgstr "" +msgstr "计量单位" #. module: purchase #: view:purchase.report:0 @@ -1787,13 +1824,13 @@ msgstr "订单" msgid "" "unique number of the purchase order,computed automatically when the purchase " "order is created" -msgstr "" +msgstr "采购订单唯一的编号，在采购订单生成时计算" #. module: purchase #: model:ir.actions.act_window,name:purchase.open_board_purchase #: model:ir.ui.menu,name:purchase.menu_board_purchase msgid "Purchase Dashboard" -msgstr "" +msgstr "采购控制台" #~ msgid "Purchase Process" #~ msgstr "采购流程" @@ -1973,8 +2010,8 @@ msgstr "" #~ msgid "Approving Purchase Order" #~ msgstr "通过采购订单" -#~ msgid "To be Invoiced" -#~ msgstr "待开票" +#~ msgid "From Picking" +#~ msgstr "来自装箱单" -#~ msgid "Product UoM" -#~ msgstr "货品计量单位" +#~ msgid "Purchase Lines Not Invoiced" +#~ msgstr "采购明细没开发票" diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po index c108b4f7ecd..9fe39ecb931 100644 --- a/addons/purchase/i18n/zh_TW.po +++ b/addons/purchase/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -24,7 +24,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 +#: code:addons/purchase/purchase.py:292 #, python-format msgid "You can not confirm purchase order without Purchase Order Lines." msgstr "" @@ -42,7 +42,7 @@ msgid "Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "" "You have to select a product UOM in the same category than the purchase UOM " @@ -69,7 +69,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -111,7 +111,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:735 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -134,7 +134,7 @@ msgid "From a Pick list" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "No Pricelist !" msgstr "" @@ -220,7 +220,7 @@ msgid "Partial Picking" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:286 +#: code:addons/purchase/purchase.py:296 #, python-format msgid "Purchase order '%s' is confirmed." msgstr "" @@ -267,7 +267,7 @@ msgid "Notes" msgstr "注解" #. module: purchase -#: code:addons/purchase/purchase.py:649 +#: code:addons/purchase/purchase.py:660 #, python-format msgid "" "You have to select a pricelist or a supplier in the purchase form !\n" @@ -341,7 +341,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:305 +#: code:addons/purchase/purchase.py:315 #, python-format msgid "Purchase amount over the limit" msgstr "" @@ -395,7 +395,7 @@ msgid "Reference" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" msgstr "" @@ -417,7 +417,7 @@ msgid "Day" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:334 +#: code:addons/purchase/purchase.py:344 #, python-format msgid "Purchase order '%s' has been set in draft state." msgstr "" @@ -434,8 +434,8 @@ msgid "# of Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 -#: code:addons/purchase/purchase.py:722 +#: code:addons/purchase/purchase.py:696 +#: code:addons/purchase/purchase.py:735 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" @@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:710 +#: code:addons/purchase/purchase.py:721 #, python-format msgid "Wrong Product UOM !" msgstr "" @@ -572,7 +572,7 @@ msgid "Order Lines" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "No Partner!" msgstr "" @@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:282 -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:292 #: code:addons/purchase/purchase.py:362 +#: code:addons/purchase/purchase.py:372 #: code:addons/purchase/wizard/purchase_line_invoice.py:122 #, python-format msgid "Error !" @@ -681,7 +681,7 @@ msgid "Reservation Destination" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:237 +#: code:addons/purchase/purchase.py:244 #, python-format msgid "Invalid action !" msgstr "" @@ -739,7 +739,7 @@ msgstr "" #: model:process.node,name:purchase.process_node_draftpurchaseorder0 #: model:process.node,name:purchase.process_node_draftpurchaseorder1 msgid "RFQ" -msgstr "" +msgstr "询价单" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice @@ -759,7 +759,7 @@ msgid " Month-1 " msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:363 +#: code:addons/purchase/purchase.py:373 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" @@ -770,7 +770,7 @@ msgid "Manual" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:400 +#: code:addons/purchase/purchase.py:410 #, python-format msgid "You must first cancel all picking attached to this purchase order." msgstr "" @@ -884,7 +884,6 @@ msgid "Month" msgstr "" #. module: purchase -#: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Waiting Supplier Ack" msgstr "" @@ -937,7 +936,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase @@ -1081,7 +1086,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:308 +#: code:addons/purchase/purchase.py:318 #, python-format msgid "" "Somebody has just confirmed a purchase with an amount over the defined limit" @@ -1098,14 +1103,14 @@ msgid "Extended Filters..." msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 +#: code:addons/purchase/purchase.py:362 #: code:addons/purchase/wizard/purchase_line_invoice.py:123 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:408 +#: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices attached to this purchase order." msgstr "" @@ -1152,7 +1157,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:685 +#: code:addons/purchase/purchase.py:696 #, python-format msgid "" "The selected supplier has a minimal quantity set to %s, you cannot purchase " @@ -1412,7 +1417,7 @@ msgid "Date Approved" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:407 +#: code:addons/purchase/purchase.py:417 #, python-format msgid "Could not cancel this purchase order !" msgstr "" @@ -1524,7 +1529,7 @@ msgid "Total Qty and Amount by month" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:399 +#: code:addons/purchase/purchase.py:409 #, python-format msgid "Could not cancel purchase order !" msgstr "" @@ -1668,7 +1673,7 @@ msgid "" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:414 +#: code:addons/purchase/purchase.py:424 #, python-format msgid "Purchase order '%s' is cancelled." msgstr "" @@ -1745,7 +1750,7 @@ msgid "Partner" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:651 +#: code:addons/purchase/purchase.py:662 #, python-format msgid "" "You have to select a partner in the purchase form !\n" diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py index 48d006f2c15..86cce749a21 100644 --- a/addons/purchase/partner.py +++ b/addons/purchase/partner.py @@ -31,7 +31,6 @@ class res_partner(osv.osv): relation='product.pricelist', domain=[('type','=','purchase')], string="Purchase Pricelist", - method=True, view_load=True, help="This pricelist will be used, instead of the default one, for purchases from the current partner"), } diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6f6ab0c1b44..2c999cdabe9 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -185,29 +185,29 @@ class purchase_order(osv.osv): 'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"), 'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"), 'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"), - 'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'), - 'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), - 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True, - help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \ + 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), + 'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), + 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'), + 'invoice_method': fields.selection([('manual','From PO/PO lines'),('order','Draft invoices pre-generated'),('picking','From receptions')], 'Invoicing Control', required=True, + help="From Order: a draft invoice will be generated based on the purchase order. The accountant " \ "will just have to validate this invoice for control.\n" \ - "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \ + "From Reception: a draft invoice will be generated based on validated receptions.\n" \ "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders." ), - 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.", + 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.", store = { 'purchase.order.line': (_get_order, ['date_planned'], 10), } ), - 'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount', + 'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount', store={ 'purchase.order.line': (_get_order, None, 10), }, multi="sums", help="The amount without tax"), - 'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes', + 'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Taxes', store={ 'purchase.order.line': (_get_order, None, 10), }, multi="sums", help="The tax amount"), - 'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total', + 'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Total', store={ 'purchase.order.line': (_get_order, None, 10), }, multi="sums",help="The total amount"), @@ -612,6 +612,14 @@ class purchase_order_line(osv.osv): res[line.id] = cur_obj.round(cr, uid, cur, taxes['total']) return res + def _get_uom_id(self, cr, uid, context=None): + try: + proxy = self.pool.get('ir.model.data') + result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit') + return result[1] + except Exception, ex: + return False + _columns = { 'name': fields.char('Description', size=256, required=True), 'product_qty': fields.float('Quantity', required=True, digits=(16,2)), @@ -622,7 +630,7 @@ class purchase_order_line(osv.osv): 'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'), 'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')), - 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')), + 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')), 'notes': fields.text('Notes'), 'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'), 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), @@ -639,6 +647,7 @@ class purchase_order_line(osv.osv): } _defaults = { + 'product_uom' : _get_uom_id, 'product_qty': lambda *a: 1.0, 'state': lambda *args: 'draft', 'invoiced': lambda *a: 0, @@ -761,6 +770,23 @@ class procurement_order(osv.osv): res = res.values() return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value + def create_procurement_purchase_order(self, cr, uid, procurement, po_vals, line_vals, context=None): + """Create the purchase order from the procurement, using + the provided field values, after adding the given purchase + order line in the purchase order. + + :params procurement: the procurement object generating the purchase order + :params dict po_vals: field values for the new purchase order (the + ``order_line`` field will be overwritten with one + single line, as passed in ``line_vals``). + :params dict line_vals: field values of the single purchase order line that + the purchase order will contain. + :return: id of the newly created purchase order + :rtype: int + """ + po_vals.update({'order_line': [(0,0,line_vals)]}) + return self.pool.get('purchase.order').create(cr, uid, po_vals, context=context) + def make_po(self, cr, uid, ids, context=None): """ Make purchase order from procurement @return: New created Purchase Orders procurement wise @@ -774,7 +800,6 @@ class procurement_order(osv.osv): pricelist_obj = self.pool.get('product.pricelist') prod_obj = self.pool.get('product.product') acc_pos_obj = self.pool.get('account.fiscal.position') - po_obj = self.pool.get('purchase.order') for procurement in self.browse(cr, uid, ids, context=context): res_id = procurement.move_id.id partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement. @@ -799,8 +824,10 @@ class procurement_order(osv.osv): context.update({'lang': partner.lang, 'partner_id': partner_id}) product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context) + taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id + taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids) - line = { + line_vals = { 'name': product.partner_ref, 'product_qty': qty, 'product_id': procurement.product_id.id, @@ -809,25 +836,20 @@ class procurement_order(osv.osv): 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), 'move_dest_id': res_id, 'notes': product.description_purchase, + 'taxes_id': [(6,0,taxes)], } - taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id - taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids) - line.update({ - 'taxes_id': [(6,0,taxes)] - }) - purchase_id = po_obj.create(cr, uid, { + po_vals = { 'origin': procurement.origin, 'partner_id': partner_id, 'partner_address_id': address_id, 'location_id': procurement.location_id.id, 'pricelist_id': pricelist_id, - 'order_line': [(0,0,line)], 'company_id': procurement.company_id.id, 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False - }) - res[procurement.id] = purchase_id - self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id}) + } + res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context) + self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]}) return res procurement_order() diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index f3f0ef0672c..6aa98f8cf6c 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -22,6 +22,33 @@ <field name="partner_address_id" ref="base.res_partner_address_zen"/> </record> + <record id="order_purchase3" model="purchase.order"> + <field name="location_id" ref="stock.stock_location_stock"/> + <field name="pricelist_id" ref="purchase.list0"/> + <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/> + <field name="partner_address_id" ref="base.res_partner_address_3000"/> + </record> + + <record id="order_purchase4" model="purchase.order"> + <field name="location_id" ref="stock.stock_location_stock"/> + <field name="pricelist_id" ref="purchase.list0"/> + <field name="partner_id" ref="base.res_partner_4"/> + <field name="partner_address_id" ref="base.res_partner_address_7"/> + </record> + + <record id="order_purchase5" model="purchase.order"> + <field name="location_id" ref="stock.stock_location_stock"/> + <field name="pricelist_id" ref="purchase.list0"/> + <field name="partner_id" ref="base.res_partner_maxtor"/> + <field name="partner_address_id" ref="base.res_partner_address_wong"/> + </record> + + <record id="order_purchase6" model="purchase.order"> + <field name="location_id" ref="stock.stock_location_stock"/> + <field name="pricelist_id" ref="purchase.list0"/> + <field name="partner_id" ref="base.res_partner_vickingdirect0"/> + <field name="partner_address_id" ref="base.res_partner_address_brussels0"/> + </record> <!--Resource: purchase.order.line--> <record id="line1_purchase" model="purchase.order.line"> @@ -54,7 +81,118 @@ <field name="product_qty">1</field> </record> + <record id="line4_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase3"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">Onsite Senior Intervention</field> + <field name="product_id" ref="product.product_product_0"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">900</field> + <field name="product_qty">10</field> + </record> + + <record id="line5_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase3"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">Onsite Intervention</field> + <field name="product_id" ref="product.product_product_1"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">100</field> + <field name="product_qty">5</field> + </record> + + <record id="line6_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase4"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[PC2] Basic+ PC (assembly on order)</field> + <field name="product_id" ref="product.product_product_pc2"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">40</field> + <field name="product_qty">5</field> + </record> + + <record id="line7_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase4"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[MB1] Mainboard ASUStek A7N8X</field> + <field name="product_id" ref="product.product_product_mb1"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">45</field> + <field name="product_qty">15</field> + </record> + + <record id="line8_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase4"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field> + <field name="product_id" ref="product.product_product_mb2"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">45</field> + <field name="product_qty">15</field> + </record> + + <record id="line9_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase5"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field> + <field name="product_id" ref="product.product_product_cpu1"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">60</field> + <field name="product_qty">3</field> + </record> + + <record id="line10_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase5"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[CPU3] Processor AMD Athlon XP 2200+</field> + <field name="product_id" ref="product.product_product_cpu3"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">50</field> + <field name="product_qty">13</field> + </record> + + <record id="line11_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase5"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[HDD1] HDD Seagate 7200.8 80GB</field> + <field name="product_id" ref="product.product_product_hdd1"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">70</field> + <field name="product_qty">10</field> + </record> + + <record id="line12_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase6"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[HDD2] HDD Seagate 7200.8 120GB</field> + <field name="product_id" ref="product.product_product_hdd2"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">70</field> + <field name="product_qty">10</field> + </record> + + <record id="line12_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase6"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[RAM] DDR 256MB PC400</field> + <field name="product_id" ref="product.product_product_ram"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">700</field> + <field name="product_qty">10</field> + </record> + + <record id="line13_purchase" model="purchase.order.line"> + <field name="order_id" ref="order_purchase6"/> + <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/> + <field name="name">[RAM512] DDR 512MB PC400</field> + <field name="product_id" ref="product.product_product_ram512"/> + <field name="product_uom" ref="product.product_uom_unit"/> + <field name="price_unit">1700</field> + <field name="product_qty">10</field> + </record> <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/> + <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase4"/> + <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/> <record id="stock.res_company_tinyshop0" model="res.company"> <field eval="1.0" name="po_lead"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index bc74fc852c1..137c44347d2 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -14,7 +14,7 @@ <menuitem id="menu_purchase_config_pricelist" name="Pricelists" - parent="menu_purchase_config_purchase" sequence="50"/> + parent="menu_purchase_config_purchase" sequence="50" groups="base.group_extended"/> <menuitem action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase" @@ -49,6 +49,14 @@ action="product.product_uom_form_action" id="menu_purchase_uom_form_action" parent="menu_purchase_unit_measure_purchase" sequence="30"/> + <menuitem + id="menu_purchase_partner_cat" name="Address Book" + parent="menu_purchase_config_purchase"/> + + <menuitem + action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories" + parent="purchase.menu_purchase_partner_cat"/> + <!--supplier addresses action--> <record id="action_supplier_address_form" model="ir.actions.act_window"> @@ -214,9 +222,9 @@ <separator string="Purchase Control" colspan="4"/> <field name="validator"/> <field name="date_approve"/> - <separator string="Invoices" colspan="4"/> - <newline/> - <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/> + <separator string="Invoices" colspan="4"/> + <newline/> + <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/> </page> <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> @@ -316,8 +324,8 @@ <form string="Purchase Order Line"> <notebook colspan="4"> <page string="Order Line"> - <field name="product_id" colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/> - <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/> + <field name="product_id" colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/> + <field name="product_qty" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/> <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/> <field colspan="4" name="name"/> <field name="date_planned" widget="date"/> @@ -455,7 +463,7 @@ <record id="purchase_line_form_action2" model="ir.actions.act_window"> - <field name="name">Purchase Lines Not Invoiced</field> + <field name="name">On Purchase Order Line</field> <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order.line</field> <field name="domain">[('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field> diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 95f433247c5..c9ad36840fa 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -44,7 +44,7 @@ "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0 "access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0 "access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0 -"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,1 +"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,0 "access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1 "access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1 "access_product_ul_purchase_manager","product.ul purchase_manager","product.model_product_ul","purchase.group_purchase_manager",1,1,1,1 @@ -58,7 +58,7 @@ "access_product_pricelist_type_purchase_manager","product.pricelist.type purchase_manager","product.model_product_pricelist_type","purchase.group_purchase_manager",1,1,1,1 "access_product_pricelist_purchase_manager","product.pricelist purchase_manager","product.model_product_pricelist","purchase.group_purchase_manager",1,1,1,1 "access_ir_property_group_purchase_manager","ir_property group_purchase_manager","base.model_ir_property","purchase.group_purchase_manager",1,1,1,1 -"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,1 +"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,0 "access_product_pricelist_version_purchase_manager","product.pricelist.version purchase_manager","product.model_product_pricelist_version","purchase.group_purchase_manager",1,1,1,1 "access_product_pricelist_item_purchase_manager","product.pricelist.item purchase_manager","product.model_product_pricelist_item","purchase.group_purchase_manager",1,1,1,1 "access_account_account_purchase_manager","account.account purchase manager","account.model_account_account","purchase.group_purchase_manager",1,0,0,0 diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index e1149c91466..a67c675b089 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -2,11 +2,12 @@ <openerp> <data noupdate="1"> - <record id="group_purchase_manager" model="res.groups"> - <field name="name">Purchase / Manager</field> - </record> <record id="group_purchase_user" model="res.groups"> - <field name="name">Purchase / User</field> + <field name="name">Purchases / User</field> + </record> + <record id="group_purchase_manager" model="res.groups"> + <field name="name">Purchases / Manager</field> + <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/> </record> <record model="ir.rule" id="purchase_order_comp_rule"> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index a65f557a3b2..538d0b81ab7 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record id="stock_move_purchase" model="ir.ui.view"> + <record id="stock_move_purchase" model="ir.ui.view"> <field name="name">stock.move.form</field> <field name="model">stock.move</field> <field name="type">form</field> @@ -29,11 +29,11 @@ id="act_purchase_order_2_stock_picking" name="Receptions" res_model="stock.picking" - groups="base.group_extended" + groups="base.group_extended" src_model="purchase.order" context="{'contact_display': 'partner'}" /> - <record id="action_picking_in_tree_view" model="ir.actions.act_window.view"> + <record id="action_picking_in_tree_view" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> <field name="view_mode">tree</field> <field name="view_id" ref="stock.view_picking_in_tree"/> @@ -57,5 +57,65 @@ </field> </field> </record> + + <!-- Picking to Invoice --> + <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view"> + <field name="name">stock.picking.in.search</field> + <field name="model">stock.picking</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Picking to Invoice"> + <group col="8" colspan="4"> + <filter icon="terp-check" name="available" string="Available" + domain="[('state','=','assigned')]" help="Incoming Shipments Available"/> + <filter icon="terp-dialog-close" name="done" string="Done" + domain="[('state','=','done')]" help="Incoming Shipments already processed"/> + <separator orientation="vertical"/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" + domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> + <filter string="To invoice" name="to_invoice" icon="terp-dolar" + domain="[('invoice_state', '=', '2binvoiced')]"/> + <separator orientation="vertical"/> + <field name="name"/> + <field name="partner_id"/> + <field name="origin"/> + <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> + </group> + <newline/> + <group expand="0" string="Group By..." colspan="4" col="8"> + <filter string="Partner" icon="terp-partner" + domain="[]" context="{'group_by':'partner_id'}"/> + <separator orientation="vertical"/> + <filter icon="terp-stock_effects-object-colorize" name="state" string="State" + domain="[]" context="{'group_by':'state'}"/> + <separator orientation="vertical"/> + <filter string="Order Date" icon="terp-go-month" + domain="[]" context="{'group_by':'date'}"/> + <filter string="Expected Date" icon="terp-go-month" + domain="[]" context="{'group_by':'min_date'}"/> + <separator orientation="vertical"/> + <filter string="Journal" icon="terp-folder-orange" + domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + </group> + </search> + </field> + </record> + + <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window"> + <field name="name">On Incoming Shipments</field> + <field name="res_model">stock.picking</field> + <field name="type">ir.actions.act_window</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,calendar</field> + <field name="domain">[('type','=','in')]</field> + <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field> + <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/> + <field name="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced.</field> + </record> + + <menuitem action="action_picking_tree4_picking_to_invoice" + id="menu_action_picking_tree4_picking_to_invoice" + parent="purchase.menu_procurement_management_invoice" sequence="90"/> </data> </openerp> diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml index 2739d74110e..e46473bd927 100644 --- a/addons/purchase/test/purchase_from_manual.yml +++ b/addons/purchase/test/purchase_from_manual.yml @@ -98,7 +98,7 @@ from tools.translate import _ pur_id1=self.browse(cr, uid, ref("purchase_order_po1")) account_obj = self.pool.get('account.invoice') - ids = account_obj.search(cr, uid, [('origin', '=', 'PO-'+str(pur_id1.id))]) + ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)]) assert ids, _('Pending Invoice is not created!') - I check that the order which was initially in the confirmed state has transit to approved state. diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml index 94239ba28c4..9425ad94812 100644 --- a/addons/purchase/test/purchase_from_picking.yml +++ b/addons/purchase/test/purchase_from_picking.yml @@ -98,7 +98,7 @@ from tools.translate import _ pur_id1=self.browse(cr, uid, ref("purchase_order_po2")) account_obj = self.pool.get('account.invoice') - ids = account_obj.search(cr, uid, [('origin', '=', 'PO-'+str(pur_id1.id))]) + ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)]) assert ids, _('Pending Invoice is not created!') - I check that the order which was initially in the confirmed state has transit to approved state. diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py index bf106adc3ac..be99a41a3cc 100644 --- a/addons/purchase/wizard/purchase_installer.py +++ b/addons/purchase/wizard/purchase_installer.py @@ -21,8 +21,7 @@ from osv import fields, osv class purchase_installer(osv.osv_memory): - _name = 'purchase.installer' - _inherit = 'res.config.installer' + _inherit = 'base.setup.installer' _columns = { 'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."), diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 93dadad007f..bc3ca11aa7b 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -3,50 +3,19 @@ <data> <record id="view_purchase_install_module_form" model="ir.ui.view"> <field name="name">Purchases Application Configuration</field> - <field name="model">purchase.installer</field> + <field name="model">base.setup.installer</field> <field name="type">form</field> - <field name="inherit_id" ref="base.res_config_installer"/> + <field name="inherit_id" ref="base_setup.view_base_setup_installer"/> <field name="arch" type="xml"> <data> - <form position="attributes"> - <attribute name="string">Purchases Application Configuration</attribute> - </form> - <xpath expr='//separator[@string="vsep"]' position='attributes'> - <attribute name='string'></attribute> - </xpath> - <separator string="title" position="attributes"> - <attribute name="string" - >Configure Your Purchases Management Application</attribute> - </separator> - <xpath expr="//label[@string='description']" - position="attributes"> - <attribute name="string">Extend your Purchases Management Application with additional functionalities.</attribute> - </xpath> - <xpath expr="//button[@string='Install Modules']" position="attributes"> - <attribute name="string">Configure</attribute> - </xpath> - <group colspan="8"> - <field name="purchase_requisition"/> - <field name="purchase_analytic_plans"/> - </group> + <xpath expr="//group[@name='purchase']" position="replace"> + <newline/> + <separator string="Purchase Management Features" colspan="4" /> + <field name="purchase_requisition" /> + <field name="purchase_analytic_plans" /> + </xpath> </data> </field> </record> - - <record id="action_purchase_install_module" model="ir.actions.act_window"> - <field name="name">Purchases Application Configuration</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">purchase.installer</field> - <field name="view_id" ref="view_purchase_install_module_form"/> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="target">new</field> - </record> - - <record id="purchase_installer_todo" model="ir.actions.todo"> - <field name="action_id" ref="action_purchase_install_module"/> - <field name="sequence">3</field> - <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> - </record> </data> </openerp> diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py index d13d2fac66b..236cde7dde5 100644 --- a/addons/purchase/wizard/purchase_line_invoice.py +++ b/addons/purchase/wizard/purchase_line_invoice.py @@ -55,18 +55,6 @@ class purchase_line_invoice(osv.osv_memory): invoice_line_obj=self.pool.get('account.invoice.line') account_jrnl_obj=self.pool.get('account.journal') - def multiple_order_invoice_name(orders): - name = "PO"; - for order in orders: - name += "-%d" % order.id - return name - - def multiple_order_invoice_reference(partner, orders): - reference = "P%dPO" % partner.id - for order in orders: - reference += "-%d" % order.id - return reference - def multiple_order_invoice_notes(orders): notes = "" for order in orders: @@ -82,6 +70,7 @@ class purchase_line_invoice(osv.osv_memory): @param orders : The set of orders to add in the invoice @param lines : The list of line's id """ + name = orders and orders[0].name or '' journal_id = account_jrnl_obj.search(cr, uid, [('type', '=', 'purchase')], context=None) journal_id = journal_id and journal_id[0] or False a = partner.property_account_payable.id @@ -90,11 +79,11 @@ class purchase_line_invoice(osv.osv_memory): else: pay_term = False inv = { - 'name': multiple_order_invoice_name(orders), - 'origin': multiple_order_invoice_name(orders), + 'name': name, + 'origin': name, 'type': 'in_invoice', 'journal_id':journal_id, - 'reference': multiple_order_invoice_reference(partner, orders), + 'reference' : partner.ref, 'account_id': a, 'partner_id': partner.id, 'address_invoice_id': orders[0].partner_address_id.id, |