-
-
-
-
-
-
-
+
@@ -223,11 +224,11 @@
-
+
@@ -245,7 +246,7 @@
-
+
@@ -256,7 +257,7 @@
-
+
@@ -268,29 +269,23 @@
search
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -300,34 +295,25 @@
search
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -492,21 +478,16 @@
search
-
-
-
-
-
-
+
+
+
-
-
-
+
@@ -559,9 +540,7 @@
parent="menu_procurement_management_invoice"
sequence="72"/>
-
+
procurement.order.form.inherit
@@ -574,6 +553,5 @@
-
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4cf91053666..aa915c620f5 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,29 +53,16 @@
search
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
-
@@ -85,7 +72,6 @@
-
@@ -93,11 +79,8 @@
-
-
-
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 27318adc0f5..2191e642ab2 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -46,35 +46,21 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index bcd27c79e9f..56a42f27bd0 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 02:08+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 20:58+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:36+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: purchase_analytic_plans
#: field:purchase.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Distribuição Analítica"
#. module: purchase_analytic_plans
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 864be1f1071..6e241fc84d0 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-01 00:40+0000\n"
-"Last-Translator: Filipe Belmont Sopranzi \n"
+"PO-Revision-Date: 2012-07-28 21:05+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:26+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: purchase_double_validation
#: view:purchase.double.validation.installer:0
@@ -48,7 +48,7 @@ msgstr "Configura o Valor Limite para Compra"
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Ordem de Compra Esperando Aprovação"
#. module: purchase_double_validation
#: view:purchase.double.validation.installer:0
@@ -68,7 +68,7 @@ msgstr "purchase.double.validation.installer"
#. module: purchase_double_validation
#: field:purchase.double.validation.installer,limit_amount:0
msgid "Maximum Purchase Amount"
-msgstr ""
+msgstr "Valor Máximo da Compra"
#~ msgid "purchase_double_validation"
#~ msgstr "purchase_double_validation"
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c1fc14c29bf..e0b8db4862f 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -134,28 +134,21 @@
search
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index c481296196c..73cf99bec34 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -99,12 +99,10 @@
search
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 8a0823a8c15..5b388469f3c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,23 +10,15 @@
search
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
@@ -39,12 +31,9 @@
search
-
-
-
-
-
-
+
+
+
@@ -55,19 +44,13 @@
search
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index f5bf1adb436..b6be6f7b1e3 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,7 @@
'version': '1.0',
'category': 'Sales Management',
"sequence": 14,
- "summary": "Quotations, Sales, Invoicing",
+ "summary": "Quotations, Sale Orders, Invoicing",
'description': """
The base module to manage quotations and sales orders.
======================================================
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 2fc96bd7db5..ced25296fcc 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-07-31 11:44+0000\n"
+"Last-Translator: gobi \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
-"X-Generator: Launchpad (build 15654)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale
#: field:sale.config.picking_policy,timesheet:0
@@ -1491,7 +1491,7 @@ msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүс
#. module: sale
#: selection:sale.order,state:0 selection:sale.report,state:0
msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн алдаа"
+msgstr "Нэхэмжлэлийн сондгойрол"
#. module: sale
#: model:process.node,note:sale.process_node_saleorder0
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a8256204d5a..0932318f49a 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:38+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-07-28 16:28+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
-"X-Generator: Launchpad (build 15654)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: sale
#: field:sale.config.picking_policy,timesheet:0
@@ -28,6 +28,8 @@ msgid ""
"Sale Order Lines that are confirmed, done or in exception state and haven't "
"yet been invoiced"
msgstr ""
+"Linhas do Pedido de Venda que estão confirmadas, feitas ou em situação de "
+"excessão e não foram ainda faturadas."
#. module: sale
#: view:board.board:0
@@ -90,7 +92,7 @@ msgstr "Aviso !"
#. module: sale
#: report:sale.order:0
msgid "Tax"
-msgstr ""
+msgstr "Imposto"
#. module: sale
#: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -123,6 +125,9 @@ msgid ""
"cancel a sale order, you must first cancel related picking or delivery "
"orders."
msgstr ""
+"Para excluir um pedido de venda confirmado, você precisa cancelar antes! "
+"Para cancelar um pedido de venda, você precisa primeiro cancelar as ordens "
+"de entrega ou de separação."
#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
@@ -262,7 +267,7 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,task_work:0
msgid "Based on Tasks' Work"
-msgstr ""
+msgstr "Baseado no Trabalho da Tarefa"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -272,7 +277,7 @@ msgstr "Cotação e Vendas"
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Fatura de Vendas"
#. module: sale
#: code:addons/sale/sale.py:330
@@ -327,6 +332,18 @@ msgid ""
" - The 'Invoice based on deliveries' choice is used to create an invoice "
"during the picking process."
msgstr ""
+"A política de Fatura é usada para sincronizar operações de faturamento e "
+"entrega.\n"
+" - 'Faturar antes da entrega' irá primeiro gerar a fatura e então gerar a "
+"ordem de separação depois do pagamento desta fatura.\n"
+" - 'Entrega e Fatura na demanda' irá criar uma ordem de separação "
+"diretamente e esperar o usuário clicar no botão 'Fatura' para gerar uma "
+"fatura provisória baseada no pedido de venda ou em linhas do pedido de "
+"venda.\n"
+" - 'Faturar depois da entrega' irá gerar uma fatura provisória baseada no "
+"pedido de venda depois que todos os itens forem entregues.\n"
+" - 'Faturar baseado em entregas' irá gerar uma fatura durante o processo "
+"de separação e entrega de cada item."
#. module: sale
#: code:addons/sale/sale.py:1171
@@ -471,6 +488,7 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced!"
msgstr ""
+"Você não pode cancelar uma linha do pedido de venda que já foi faturada!"
#. module: sale
#: code:addons/sale/sale.py:1079
@@ -534,7 +552,7 @@ msgstr "Mês-1"
#. module: sale
#: view:sale.report:0
msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Mês de ordenação do pedido de venda"
#. module: sale
#: code:addons/sale/sale.py:504
@@ -542,6 +560,7 @@ msgstr ""
msgid ""
"You cannot group sales having different currencies for the same partner."
msgstr ""
+"Você não pode agrupar vendas com moedas diferentes para o mesmo parceiro."
#. module: sale
#: selection:sale.order,picking_policy:0
@@ -606,7 +625,7 @@ msgstr "Endereço de Faturamento :"
#. module: sale
#: field:sale.order.line,sequence:0
msgid "Line Sequence"
-msgstr ""
+msgstr "Sequência da Linha"
#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -773,6 +792,8 @@ msgstr "Setembro"
#, python-format
msgid "You cannot confirm a sale order which has no line."
msgstr ""
+"Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
+"pedido."
#. module: sale
#: code:addons/sale/sale.py:1259
@@ -781,6 +802,9 @@ msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
"Please set one before choosing a product."
msgstr ""
+"Você precisa escolher uma lista de preços ou um cliente no formulário de "
+"vendas!\n"
+"Por favor escolha um antes de escolher um produto."
#. module: sale
#: view:sale.report:0 field:sale.report,categ_id:0
@@ -877,12 +901,18 @@ msgid ""
"The 'Waiting Schedule' state is set when the invoice is confirmed but "
"waiting for the scheduler to run on the order date."
msgstr ""
+"Informa a Situação da cotação ou pedido de venda.\n"
+"A Situação de Excessão é automaticamente definida quando um Cancelamento "
+"ocorre na validação da fatura (Excessão de Fatura) ou no processo de "
+"separação (Excessão de Entrega).\n"
+"O 'Aguardando Agendamento' é definido quando a fatura está confirmada, mas "
+"está esperando o agendamento na data do pedido."
#. module: sale
#: code:addons/sale/sale.py:1272
#, python-format
msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "Não foi encontrada uma linha de preço válida!"
#. module: sale
#: view:sale.order:0
@@ -892,7 +922,7 @@ msgstr "Histórico"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "Faturar depois da entrega"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -936,7 +966,7 @@ msgstr "Referências"
#. module: sale
#: view:sale.order.line:0
msgid "My Sales Order Lines"
-msgstr ""
+msgstr "Minhas linhas de Pedido de Venda"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -968,7 +998,7 @@ msgstr "Total de Impostos Excluídos"
#. module: sale
#: view:sale.order.line:0
msgid "Order reference"
-msgstr ""
+msgstr "Referência do Pedido"
#. module: sale
#: view:sale.open.invoice:0
@@ -994,7 +1024,7 @@ msgstr "Nota Fiscal Aberta"
#. module: sale
#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "Email automático do Pedido de Vendas"
#. module: sale
#: code:addons/sale/sale.py:413
@@ -1059,6 +1089,8 @@ msgstr "Criar Ordem de Entrega"
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'!"
msgstr ""
+"Não é possível excluir uma linha de pedido de vendas que possui situação "
+"'%s'!"
#. module: sale
#: view:sale.order:0
@@ -1078,7 +1110,7 @@ msgstr "Criar lista de Opções"
#. module: sale
#: view:sale.report:0
msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "Pedidos de Venda ordenado por data"
#. module: sale
#: view:sale.report:0
@@ -1215,6 +1247,80 @@ msgid ""
"% endif\n"
" "
msgstr ""
+"\n"
+"Olá${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Aqui está a confirmação de seu pedido para ${object.partner_id.name}:\n"
+" | Número do Pedido: *${object.name}*\n"
+" | Valor Total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Data: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Referência: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Sua referência: ${object.client_order_ref} \n"
+" % endif\n"
+" | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Você pode ver a confirmação do pedido, fazer o download e até efetuar o "
+"pagamento online através do link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"¤cy_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"Também é possível pagar diretamente com Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Se tiver alguma dúvida por favor entre em contato conosco.\n"
+"\n"
+"\n"
+"Obrigado por escolher ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1240,7 +1346,7 @@ msgstr "Impostos"
#. module: sale
#: view:sale.order:0
msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "Pedido de Venda pronto para ser faturado"
#. module: sale
#: help:sale.order,create_date:0
@@ -1260,7 +1366,7 @@ msgstr "Criar Notas Fiscais"
#. module: sale
#: view:sale.report:0
msgid "Sales order created in current month"
-msgstr ""
+msgstr "Pedidos de venda criados neste mês"
#. module: sale
#: report:sale.order:0
@@ -1274,6 +1380,9 @@ msgid ""
"create a task, purchase order or manufacturing order linked to this sale "
"order line."
msgstr ""
+"Se 'No Pedido' ele aciona uma ação quando o pedido de venda for confirmado, "
+"para criar uma tarefa, pedido de compra, ou ordem de produção associado a "
+"esta linha de pedido."
#. module: sale
#: field:sale.advance.payment.inv,amount:0
@@ -1283,7 +1392,7 @@ msgstr "Montante de Adiantamento"
#. module: sale
#: field:sale.config.picking_policy,charge_delivery:0
msgid "Do you charge the delivery?"
-msgstr ""
+msgstr "Cobrar entrega?"
#. module: sale
#: selection:sale.order,invoice_quantity:0
@@ -1302,6 +1411,8 @@ msgid ""
"If you change the pricelist of this order (and eventually the currency), "
"prices of existing order lines will not be updated."
msgstr ""
+"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
+"moeda), os preços da linha de pedido existente não serão atualizadas."
#. module: sale
#: model:ir.model,name:sale.model_stock_picking
@@ -1330,7 +1441,7 @@ msgstr "Quantidade(UoM)"
#. module: sale
#: view:sale.report:0
msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "Ano do pedido de venda"
#. module: sale
#: selection:sale.report,month:0
@@ -1351,7 +1462,7 @@ msgstr "Pendência no Embarque"
#: code:addons/sale/sale.py:1156
#, python-format
msgid "Picking Information ! : "
-msgstr ""
+msgstr "Informações de Separação ! : "
#. module: sale
#: field:sale.make.invoice,grouped:0
@@ -1361,13 +1472,13 @@ msgstr "Agrupar Notas Fiscais"
#. module: sale
#: field:sale.order,order_policy:0
msgid "Invoice Policy"
-msgstr ""
+msgstr "Politica de Faturamento"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_config_picking_policy
#: view:sale.config.picking_policy:0
msgid "Setup your Invoicing Method"
-msgstr ""
+msgstr "Configure o Método de Faturamento"
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1385,6 +1496,8 @@ msgid ""
"This tool will help you to install the right module and configure the system "
"according to the method you use to invoice your customers."
msgstr ""
+"Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
+"sistema de acordo com o método usado para cobrar seus clientes."
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1421,6 +1534,10 @@ msgid ""
"Here is a proposition of quantities according to the packaging:\n"
"EAN: %s Quantity: %s Type of ul: %s"
msgstr ""
+"Você selecionou uma quantidade de %d unidades.\n"
+"Mas não é compatível com a embalagem escolhida.\n"
+"Aqui segue uma proposta de quantidades compatível com a embalagem:\n"
+"AN: %s Quantidade: %s Tipo de : %s"
#. module: sale
#: view:sale.order:0
@@ -1460,7 +1577,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "Linhas de pedido confirmadas e não entregues"
#. module: sale
#: code:addons/sale/sale.py:473
@@ -1547,7 +1664,7 @@ msgstr "Mês"
#. module: sale
#: model:email.template,subject:sale.email_template_edi_sale
msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
#. module: sale
#: view:sale.order.line:0 field:sale.order.line,product_id:0
@@ -1680,12 +1797,12 @@ msgstr ""
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Pay before delivery"
-msgstr ""
+msgstr "Pagar antes da entrega"
#. module: sale
#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
msgid "Sales Dashboard"
-msgstr ""
+msgstr "Painel de Vendas"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1707,7 +1824,7 @@ msgstr "Data na qual o pedido de venda é confirmado."
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract/Analytic Account"
-msgstr ""
+msgstr "Conta de Contrato/Analítica"
#. module: sale
#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
@@ -1733,6 +1850,9 @@ msgid ""
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
msgstr ""
+"Não foi possível encontrar uma linha da lista de preços para este produto e "
+"quantidade.\n"
+"Você precisa alterar ou o produto, a quantidade ou a lista de preços."
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1760,7 +1880,7 @@ msgstr "Cancelada"
#. module: sale
#: view:sale.order.line:0
msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "Linhas de Pedido de Venda relacionadas ao meu pedido"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1803,7 +1923,7 @@ msgstr "Quantidade (UdS)"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Linhas do Pedido que estão 'Feitas'"
#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
@@ -1826,7 +1946,7 @@ msgstr "Confirmada"
#. module: sale
#: field:sale.config.picking_policy,order_policy:0
msgid "Main Method Based On"
-msgstr ""
+msgstr "Método principal baseado em"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1869,7 +1989,7 @@ msgstr "Configuração"
#: code:addons/sale/edi/sale_order.py:146
#, python-format
msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI Lista de Preços (%s)"
#. module: sale
#: view:sale.order:0
@@ -1879,7 +1999,7 @@ msgstr "Imprimir Pedido"
#. module: sale
#: view:sale.report:0
msgid "Sales order created in current year"
-msgstr ""
+msgstr "Pedidos de Venda criados este ano"
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:113
@@ -1898,7 +2018,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Sale order lines done"
-msgstr ""
+msgstr "Linhas de pedido concluídas"
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -2010,18 +2130,18 @@ msgstr "Separação"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Linhas de pedido prontas para faturar"
#. module: sale
#: view:sale.report:0
msgid "Sales order created in last month"
-msgstr ""
+msgstr "Pedidos de venda criados mês passado"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_email_templates
#: model:ir.ui.menu,name:sale.menu_email_templates
msgid "Email Templates"
-msgstr ""
+msgstr "Modelos de Email"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -2081,7 +2201,7 @@ msgstr "Compromisso Atrasado"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "Entrega e Fatura na demanda"
#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
@@ -2110,7 +2230,7 @@ msgstr "Pedidos de venda confirmados para faturamento."
#. module: sale
#: view:sale.order:0
msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "Pedidos de Venda que não foram confirmados"
#. module: sale
#: code:addons/sale/sale.py:322
@@ -2132,7 +2252,7 @@ msgstr "Encerrar"
#: code:addons/sale/sale.py:1261
#, python-format
msgid "No Pricelist ! : "
-msgstr ""
+msgstr "Nenhuma Lista de Preços ! : "
#. module: sale
#: field:sale.order,shipped:0
@@ -2213,7 +2333,7 @@ msgstr "Solicitação para Pedido de Venda"
#: code:addons/sale/sale.py:1255
#, python-format
msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Sem Estoque Suficiente ! : "
#. module: sale
#: report:sale.order:0 field:sale.order,payment_term:0
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 8eb4fc85ce6..1ac6d425530 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,53 +50,35 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index c93651219af..8617256d23b 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -26,14 +26,10 @@
- Module Sales Management has been installed
- From the top menu Sales, manage your customers, quotations and
- sales orders. With sale orders, you can manage product
- deliveries and customer invoices.
+ The Sales Management application has been installed.
+ <b>Click on the top menu <i>'Sales'</i></em> to start managing your customers, sending quotations and processing sale orders.
- If you need to manage your sales pipeline (leads, opportunities,
- phonecalls), you can install the module CRM from the top menu
- Settings.
+If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module <i>CRM</i> from the top menu Settings.
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ac665df7a6b..48e823250dc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -156,9 +156,11 @@
-
-
-
+
+
+
+
+
@@ -357,26 +359,19 @@
-
-
-
+
+
+
-
-
-
-
@@ -529,13 +524,12 @@
+
-
-
@@ -555,18 +549,17 @@
+
+
-
-
-
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 5a7e0b77495..aeabdf25de4 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-06 21:31+0000\n"
+"PO-Revision-Date: 2012-07-30 16:29+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
@@ -31,12 +31,12 @@ msgstr "注文参照は、会社ごとに固有でなければなりません。
#: code:addons/sale_crm/wizard/crm_make_sale.py:112
#, python-format
msgid "Converted to Sales Quotation(%s)."
-msgstr "販売見積書(%s)を移動"
+msgstr "受注見積(%s)に変換"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "Convert to Quotation"
-msgstr "見積りへ移動"
+msgstr "見積に変換"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
@@ -48,7 +48,7 @@ msgstr "データ不足です。"
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
#, python-format
msgid "Customer has no addresses defined!"
-msgstr "顧客の住所が不明確です。"
+msgstr "顧客の住所が定義されていません。"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_make_sale
@@ -58,7 +58,7 @@ msgstr "営業する。"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "_Create"
-msgstr "_作成"
+msgstr "作成"
#. module: sale_crm
#: view:sale.order:0
@@ -69,22 +69,22 @@ msgstr "私の営業チーム"
#: help:crm.make.sale,close:0
msgid ""
"Check this to close the opportunity after having created the sale order."
-msgstr "発注書を作成後、これをチェックしオポチュニティを終了します。"
+msgstr "発注書を作成後、商談を終了するためにこれをチェックします。"
#. module: sale_crm
#: view:board.board:0
msgid "My Opportunities"
-msgstr "私のオポチュニティ"
+msgstr "私の商談"
#. module: sale_crm
#: view:crm.lead:0
msgid "Convert to Quote"
-msgstr "見積りへ移動"
+msgstr "見積に変換"
#. module: sale_crm
#: field:crm.make.sale,shop_id:0
msgid "Shop"
-msgstr "お店"
+msgstr "店"
#. module: sale_crm
#: field:crm.make.sale,partner_id:0
@@ -95,12 +95,12 @@ msgstr "顧客"
#: code:addons/sale_crm/wizard/crm_make_sale.py:92
#, python-format
msgid "Opportunity: %s"
-msgstr "オポチュニティ: %s"
+msgstr "商談:%s"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Close Opportunity"
-msgstr "オポチュニティ成立"
+msgstr "商談を閉じる"
#. module: sale_crm
#: view:board.board:0
@@ -111,7 +111,7 @@ msgstr "段階別私の計画売上高"
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Opportunity '%s' is converted to Quotation."
-msgstr "オポチュニティの'%s' は、見積に変換されました。"
+msgstr "商談 %s は見積に変換されました。"
#. module: sale_crm
#: view:sale.order:0
@@ -122,7 +122,7 @@ msgstr "営業チーム"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
msgid "Make Quotation"
-msgstr "見積り作成"
+msgstr "見積作成"
#. module: sale_crm
#: view:crm.make.sale:0
@@ -132,4 +132,4 @@ msgstr "キャンセル"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_sale_order
msgid "Sales Order"
-msgstr "受注"
+msgstr "受注オーダー"
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 4737b125eac..110bef65e51 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -7,30 +7,30 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-29 10:47+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 19:41+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "Categoria"
#. module: sale_crm
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:112
#, python-format
msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Convertido para Cotação (%s)."
#. module: sale_crm
#: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Criar"
#. module: sale_crm
#: view:sale.order:0
msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Minha Equipe de Vendas"
#. module: sale_crm
#: help:crm.make.sale,close:0
@@ -75,7 +75,7 @@ msgstr ""
#. module: sale_crm
#: view:board.board:0
msgid "My Opportunities"
-msgstr ""
+msgstr "Minhas Oportunidades"
#. module: sale_crm
#: view:crm.lead:0
@@ -106,13 +106,13 @@ msgstr "Fechar Oportunidade"
#. module: sale_crm
#: view:board.board:0
msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Minhas Receitas Planejadas por Estágio"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Opportunity '%s' is converted to Quotation."
-msgstr ""
+msgstr "A Oportunidade '%s' foi convertida para uma cotação."
#. module: sale_crm
#: view:sale.order:0
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index d6b7f28d049..6efaea2ac53 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -36,13 +36,14 @@
+
-
+
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 31e94c023d1..0f8910c0e8e 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 09:27+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 19:50+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:04+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: sale_journal
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -29,7 +29,7 @@ msgstr "Nota"
#. module: sale_journal
#: field:res.partner,property_invoice_type:0
msgid "Invoicing Type"
-msgstr ""
+msgstr "Tipo de Fatura"
#. module: sale_journal
#: help:res.partner,property_invoice_type:0
@@ -37,11 +37,12 @@ msgid ""
"This invoicing type will be used, by default, for invoicing the current "
"partner."
msgstr ""
+"Este tipo de fatura será usada, por padrão, para faturar o parceiro atual."
#. module: sale_journal
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
#. module: sale_journal
#: view:res.partner:0
@@ -99,7 +100,7 @@ msgstr ""
#. module: sale_journal
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
#. module: sale_journal
#: field:sale.order,invoice_type_id:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index 6d04bd6e6e0..d0b51f8404f 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-20 04:29+0000\n"
-"Last-Translator: Tomomi Mengelberg \n"
+"PO-Revision-Date: 2012-07-30 16:32+0000\n"
+"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale_margin
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr "発注参照は、会社ごとにユニークでなければなりません。"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
@@ -30,7 +30,7 @@ msgstr "原価"
#. module: sale_margin
#: model:ir.model,name:sale_margin.model_sale_order
msgid "Sales Order"
-msgstr "受注"
+msgstr "受注オーダー"
#. module: sale_margin
#: help:sale.order,margin:0
@@ -48,4 +48,4 @@ msgstr "粗利益"
#. module: sale_margin
#: model:ir.model,name:sale_margin.model_sale_order_line
msgid "Sales Order Line"
-msgstr "受注明細"
+msgstr "受注オーダー行"
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index aea579c2d60..4dd027ca579 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 10:12+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 19:50+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: sale_margin
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 85462ecc6f6..b94f7b78657 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 10:07+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 19:51+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: sale_order_dates
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
#. module: sale_order_dates
#: help:sale.order,requested_date:0
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index defbc522340..3af69bb025b 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,8 +7,7 @@
search
-
-
+
@@ -32,11 +31,8 @@
-
-
-
+
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d061fb4b033..0f0f758f4d6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,7 +23,7 @@
"name" : "Warehouse Management",
"version" : "1.1",
"author" : "OpenERP SA",
- "summary": "Incoming Shipments, Deliveries, Inventory, Stock",
+ "summary": "Inventory, Logistic, Storage",
"description" : """
OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
======================================================================================================
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 04a0959739a..70fb06709f6 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,8 +9,8 @@
-
-
+
+
@@ -105,15 +105,15 @@
-
-
-
+
+
+
-
+
@@ -123,7 +123,7 @@
-
+
Receive Products
stock.move
@@ -136,7 +136,7 @@
Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.
-
+
Receive Products
stock.move
@@ -215,17 +215,5 @@
-
-
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 89cbd9c1340..56d17976aad 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -56,52 +56,33 @@
search
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
@@ -163,23 +144,15 @@
search
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -189,17 +162,13 @@
-
-
-
-
+
-
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 69a7829f565..15dafbfdbc1 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -35,14 +35,10 @@
-
-
-
-
-
+
+
+
+
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6d8f6bb6fec..9752f0c78f4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -619,7 +619,7 @@ class stock_picking(osv.osv):
'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
- 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Shipping type specify, goods coming in or going out."),
+ 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index ec0860f62c7..03a107b6947 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -6,9 +6,9 @@
-
+
+
+
IT Suppliers
@@ -44,16 +44,14 @@
-
+
Starting Inventory
-
+
+
+
@@ -185,10 +183,10 @@
1
-
+ Shop 1
-
+ Felix
@@ -197,17 +195,17 @@
-
+ Shop 1
1
-
+ Shop 2
-
+ Edwin
@@ -216,36 +214,36 @@
-
+ Shop 2
-
-
+ internal
+ none
-
-
+ Shop 1
+ manual
-
+ internal
-
+ Shop 2
-
-
+ procurement
+ Internal Shippings
-
+ Shop 1
@@ -266,5 +264,6 @@
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d4acd4906ad..3c08c1eaff0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -79,14 +79,9 @@
search
-
-
-
-
-
-
-
-
+
+
+
@@ -290,13 +285,9 @@
search
-
-
-
-
-
-
-
+
+
+
@@ -405,16 +396,10 @@
search
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -569,14 +554,9 @@
-
-
-
-
-
+
+
+
@@ -683,14 +663,9 @@
-
-
@@ -733,14 +708,16 @@
@@ -866,8 +847,8 @@
-
-
+
+
@@ -890,26 +871,18 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
@@ -941,11 +914,7 @@
-
+
stock.picking.out.tree
stock.picking
@@ -971,18 +940,18 @@
form
-
+
-
+
-
+
-
+
@@ -1003,26 +972,20 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -1059,11 +1022,7 @@
-
+
stock.picking.in.tree
stock.picking.in
@@ -1089,7 +1048,7 @@
form
-
+
@@ -1115,25 +1074,19 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
@@ -1191,8 +1144,7 @@
+ states="draft,waiting,confirmed,assigned"/>
-
-
stock.move.form
stock.move
@@ -1305,33 +1255,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -1351,13 +1293,10 @@
- ====================================
- Reception Picking (By Stock Move)
- ====================================
-
-
-
-
+
stock.move.tree2
stock.move
@@ -1377,7 +1316,7 @@
+
-
+
stock.move.tree3
stock.move
tree
@@ -1418,24 +1358,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -1449,24 +1383,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -1499,9 +1427,7 @@
- # -------------------------------------------------------------
- # Stock incoterms
- # -------------------------------------------------------------
+
stock.incoterms.tree
stock.incoterms
@@ -1639,7 +1565,6 @@
-
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index f315c63834a..a57e720684f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -98,9 +98,15 @@ class stock_partial_picking(osv.osv_memory):
if context is None: context = {}
res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
picking_ids = context.get('active_ids', [])
- if context['active_model'] == 'purchase.order':
+ active_model = context.get('active_model')
+
+ if active_model == 'purchase.order':
for purchase_order in self.pool.get('purchase.order').browse(cr, uid, picking_ids, context=context):
picking_ids = [picking_id.id for picking_id in purchase_order.picking_ids]
+ elif active_model == 'sale.order':
+ for sale_order in self.pool.get('sale.order').browse(cr, uid, picking_ids, context=context):
+ picking_ids = [picking.id for picking in sale_order.picking_ids]
+
if not picking_ids or len(picking_ids) != 1:
# Partial Picking Processing may only be done for one picking at a time
return res
@@ -108,7 +114,7 @@ class stock_partial_picking(osv.osv_memory):
# (already seen in previous bug where context passed was containing ir.ui.menu as active_model and the menu
# ID as active_id). Though this should be fixed in clients now, this place is sensitive enough to ensure the
# consistancy of the context.
- assert context.get('active_model') in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order'), 'Bad context propagation'
+ assert active_model in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order', 'sale.order'), 'Bad context propagation'
picking_id, = picking_ids
if 'picking_id' in fields:
res.update(picking_id=picking_id)
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index e3911d336ff..2abd09e6d3a 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-04 23:38+0000\n"
+"PO-Revision-Date: 2012-07-30 16:28+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -1184,7 +1184,7 @@ msgstr "誰がこの予測を作成したのか、検証したのかを示しま
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_team_id:0
msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
#. module: stock_planning
#: help:stock.planning,incoming_left:0
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a2fdc9788e1..8c1cb0d2c80 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -51,10 +51,8 @@
-
-
@@ -199,18 +197,15 @@
-
-
-
@@ -308,17 +303,14 @@
-
-
-
-
+
+
+
-
-
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3271096a51a..8b9be319ea6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -3,11 +3,7 @@
-
+
subscription.subscription.form
subscription.subscription
@@ -17,7 +13,7 @@
@@ -73,23 +69,16 @@
search
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
-
@@ -103,7 +92,7 @@
form
{'search_default_User':1}
-
+
@@ -167,11 +156,8 @@
search
-
-
-
-
-
+
+
@@ -208,11 +194,12 @@
subscription.document
form
-
+
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index fb4b232f512..22838058bec 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -277,20 +277,15 @@
search
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
@@ -553,9 +548,7 @@
-
-
@@ -759,11 +752,9 @@
-
-
-
+
-
+
@@ -1180,22 +1171,17 @@
search
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
index 2558123ad28..18657350e25 100644
--- a/addons/users_ldap/i18n/pt_BR.po
+++ b/addons/users_ldap/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-16 18:46+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-07-28 22:27+0000\n"
+"Last-Translator: Fábio Martinelli \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
#. module: users_ldap
#: constraint:res.company:0
@@ -35,6 +35,9 @@ msgid ""
"option requires a server with STARTTLS enabled, otherwise all authentication "
"attempts will fail."
msgstr ""
+"Solicite a conexão segura com encriptação TLS/SSL quando se conectar no "
+"servidor LDAP. Esta opção requer um servidor com STARTTLS habilitado, caso "
+"contrário a autenticação irá falhar"
#. module: users_ldap
#: view:res.company:0
@@ -78,6 +81,8 @@ msgid ""
"The user account on the LDAP server that is used to query the directory. "
"Leave empty to connect anonymously."
msgstr ""
+"A conta do usuário no servidor LDAP que é usada para a busca no diretório, "
+"deixe em branco para conectar anonimamente"
#. module: users_ldap
#: field:res.company.ldap,ldap_base:0
@@ -87,12 +92,12 @@ msgstr "Base LDAP"
#. module: users_ldap
#: view:res.company.ldap:0
msgid "User Information"
-msgstr ""
+msgstr "Informações do usuário"
#. module: users_ldap
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
#. module: users_ldap
#: model:ir.model,name:users_ldap.model_res_company
@@ -102,7 +107,7 @@ msgstr "Empresas"
#. module: users_ldap
#: view:res.company.ldap:0
msgid "Process Parameter"
-msgstr ""
+msgstr "Parâmetro de Processo"
#. module: users_ldap
#: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -112,7 +117,7 @@ msgstr "res.company.ldap"
#. module: users_ldap
#: field:res.company.ldap,ldap_tls:0
msgid "Use TLS"
-msgstr ""
+msgstr "Usar TLS"
#. module: users_ldap
#: field:res.company.ldap,sequence:0
@@ -122,17 +127,17 @@ msgstr "Sequência"
#. module: users_ldap
#: view:res.company.ldap:0
msgid "Login Information"
-msgstr ""
+msgstr "Informações de login"
#. module: users_ldap
#: view:res.company.ldap:0
msgid "Server Information"
-msgstr ""
+msgstr "Informação do servidor"
#. module: users_ldap
#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Configure seu servidor LDAP"
#. module: users_ldap
#: sql_constraint:res.users:0
@@ -150,6 +155,8 @@ msgid ""
"The password of the user account on the LDAP server that is used to query "
"the directory."
msgstr ""
+"A senha da conta de usuário no servidor LDAP que é usada para a busca no "
+"diretório"
#. module: users_ldap
#: field:res.company.ldap,ldap_password:0
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index b0f0ab0198e..d0d4c35a80d 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -176,14 +176,10 @@
-
-
-
-