[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120718044820-s4r6iiuxh8zk8db2

addons/account/account_view.xml

@@ -921,15 +921,15 @@
             <field name="arch" type="xml">
                 <form string="Account Tax" version="7.0">
                     <group>
-			<group>
+                        <group>
                             <field name="name"/>
                             <field name="description"/>
-			<group>
+                        </group>
-			</group>
+                        <group>
                             <field name="type_tax_use"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="active"/>
-			</group>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Tax Definition">

addons/account_bank_statement_extensions/i18n/mn.po

@@ -0,0 +1,374 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-16 07:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
+"X-Generator: Launchpad (build 15627)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Банкны гүйлгээгээр хайх"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Багц төлбөрийн мэдээлэл"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Кредитын гүйлгээ"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Гүйлгээ"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Дебитын гүйлгээ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Мөнгөн тэмдэгтийн огноо"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Гарын авлага"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Тайлангийн мөр"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Банкны тайлангийн мөр"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Хүү багцын төлбөр"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""

addons/account_check_writing/i18n/mn.po

@@ -0,0 +1,199 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-16 07:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
+"X-Generator: Launchpad (build 15627)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Чекийн дээд хэсэг"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Чек хэвлэх"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Чекийн төв хэсэг"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Чекийн доод хэсэг"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Бичсэн чекийг зөвшөөрөх"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Чек бичих"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Чекийн дүн"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""

addons/anonymous/anonymous.xml

@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record model="res.users" id="user">
+    <record id="anonymous_user" model="res.users">
         <field name="name">Anonymous</field>
         <field name="login">anonymous</field>
         <field name="password">anonymous</field>
+        <!-- Avoid auto-including this demo user in any default group -->
         <field name="groups_id" eval="[(5,)]"/>
         <field name="avatar">iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg==</field>
     </record>
+
+    <!--
+        A group dedicated to the anonymous user only, making groups
+        restrictions more convenient.
+    -->
+    <record id="group_anonymous" model="res.groups">
+        <field name="name">Anonymous Group</field>
+        <field name="users" eval="[(4,ref('anonymous_user'))]"/>
+    </record>
   </data>
 </openerp>

addons/association/i18n/mn.po

@@ -0,0 +1,135 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-07-16 07:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
+"X-Generator: Launchpad (build 15627)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Нөөцийн менежмент"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Зарпал хянах"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr ""

addons/base_action_rule/i18n/sv.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-13 14:20+0000\n"
+"PO-Revision-Date: 2012-07-16 15:31+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -51,7 +51,7 @@ msgstr "Objekt"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Skicka till dessa e-postadresser"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
@@ -209,7 +209,7 @@ msgstr "Ogiltiga argument"
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "Sätt ansvarig till"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0

addons/delivery/delivery_view.xml

@@ -15,60 +15,82 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
-                    <group col="4" name="general">
+                    <div class="oe_title">
-                        <field name="name"/>
+                        <label for="name" class="oe_edit_only"/>
-                        <field name="partner_id"/>
+                        <h1>
-                        <field name="product_id"/>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group name="general">
+                            <field name="partner_id"/>
+                            <field name="product_id"/>
+                        </group>
+                        <group>
                         <field name="active"/>
-                        <separator string="Pricing Information" colspan="4"/>
+                        </group>
-                        <group colspan="4" col="4">
+                    </group>
+                    <group col="4">
+                        <group string="Pricing Information">
                             <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                            <newline/>
+                            <label for="free_if_more_than"/>
-                            <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                            <div>
-                            <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                                <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                            </div>
                         </group>
                         <newline/>
                         <field name="use_detailed_pricelist"/>
                     </group>
-                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
-                         <tree string="Delivery grids">
+                        <tree string="Delivery grids">
                               <field name="sequence"/>
                               <field name="name"/>
-                         </tree>
+                        </tree>
                         <form string="Delivery grids" version="7.0">
-                             <group col="4">
+                             <group>
-                                 <field name="name"/>
+                                <group>
-                                 <field name="active"/>
+                                    <field name="name"/>
-                                 <field name="sequence"/>
+                                </group>
+                                <group>
+                                    <field name="active"/>
+                                    <field name="sequence"/>
+                                </group>
                              </group>
                              <notebook>
-                               <page string="Grid definition">
+                                <page string="Grid definition">
-                                  <field name="line_ids"/>
+                                   <field name="line_ids"/>
-                               </page>
+                                </page>
-                               <page string="Destination">
+                                <page string="Destination">
-                                   <group string="Countries">
+                                    <group>
-                                       <field colspan="2" name="country_ids" nolabel="1"/>
+                                        <group>
-                                   </group>
+                                            <field name="country_ids" widget="many2many_tags"/>
-                                   <group string="States">
+                                            <field name="state_ids" widget="many2many_tags"/>
-                                       <field colspan="2" name="state_ids" nolabel="1"/>
+                                        </group>
-                                   </group>
+                                        <group>
-                                   <group col="4">
+                                            <label for="zip_from" string="Zip"/>
-                                       <field name="zip_from"/>
+                                            <div>
-                                       <field name="zip_to"/>
+                                                <field name="zip_from" class="oe_inline"/>
-                                   </group>
+                                                -
-                               </page>
+                                                <field name="zip_to" class="oe_inline"/>
-                             </notebook>
+                                            </div>
-                       </form>
+                                        </group>
+                                    </group>
+                                </page>
+                            </notebook>
+                        </form>
                    </field>
                 </form>
             </field>
         </record>
+        
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
             <field name="name">Delivery Method</field>
             <field name="type">ir.actions.act_window</field>
@@ -140,18 +162,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
-                    <field colspan="4" name="name"/>
+                    <group>
-                    <div>
+                        <field name="name"/>
-                        <label string="condition" for="type"/>
+                    </group>
-                        <field name="type" class="oe_inline"/>
+                    <group>
-                        <field name="operator" class="oe_inline"/>
+                        <group>
-                        <field name="max_value" class="oe_inline"/>
+                            <label for="type" string="Condition"/>
-                    </div>
+                            <div>
-                    <group col="4">
+                                <field name="type" class="oe_inline"/>
-                        <field name="list_price"/>
+                                <field name="operator" class="oe_inline"/>
-                        <field name="standard_price"/>
+                                <field name="max_value" class="oe_inline"/>
-                        <field name="price_type"/>
+                            </div>
-                        <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                            <label for="price_type"/>
+                            <div>
+                                <field name="price_type" class="oe_inline"/>
+                                <label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                                <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="list_price"/>
+                            <field name="standard_price"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -178,7 +210,7 @@
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="after">
+                <field name="min_date" position="after">
                     <field name="carrier_id"/>
                     <field name="carrier_tracking_ref"/>
                     <field name="number_of_packages"/>
@@ -230,23 +262,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <field name="picking_id" position="after">
+                <xpath expr="//group[@name='main_grp']" position="inside">
                     <field name="weight"/>
                     <field name="weight_net"/>
-                </field>
+                </xpath>
-            </field>
-        </record>
-
-        <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
-            <field name="name">stock.move.reception.packing.form.weight</field>
-            <field name="type">form</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
-            <field name="arch" type="xml">
-                <field name="picking_id">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
             </field>
         </record>
 
@@ -264,7 +283,7 @@
                             <button name="delivery_set" string="Add in Quote" type="object"
                                 class="oe_edit_only"
                                 attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
-        		    <br/>
+                            <br/>
                             <label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
                                 class="oe_edit_only"
                                 attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>

addons/hr_attendance/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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:58+0000\n"
+"PO-Revision-Date: 2012-07-16 15:25+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:10+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -225,7 +225,7 @@ msgstr "Startdatum"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "Min Delay"
+msgstr "Minsta fördröjning"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0

addons/hr_timesheet_sheet/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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-11-22 21:07+0000\n"
+"PO-Revision-Date: 2012-07-16 15:49+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:05+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr "Today"
+msgstr "Idag"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
@@ -74,7 +74,8 @@ msgstr "Today"
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
-"Please verify that the total difference of the sheet is lower than %.2f !"
+"Vänligen kontrollera att den totala skillnaden mellan rapporterna är mindre "
+"än %.2f!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -89,7 +90,7 @@ msgstr "# Kostnad"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Tidrapport från förra månaden"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0

addons/import_google/i18n/pt_BR.po

@@ -0,0 +1,217 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-16 20:10+0000\n"
+"Last-Translator: Rafael <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
+"X-Generator: Launchpad (build 15627)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Importar o Calendário de Eventos da Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Fornecedor"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Opções de importação"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Nome do Grupo"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importar Contatos do Google"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "sincronizar.importação.google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Importar Calendário do Google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Erro"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Aviso !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Opções"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Nome do Calendário"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr ""
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "Usuário"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""

addons/mail/res_users_view.xml

@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <field name="context_tz" position="after">
+                <field name="user_email" position="before">
                     <field name="notification_email_pref" readonly="0"/>
                 </field>
             </data>
@@ -23,7 +23,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <field name="context_tz" position="after">
+                <field name="user_email" position="before">
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">

addons/membership/i18n/pt_BR.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-07-18 17:46+0000\n"
+"PO-Revision-Date: 2012-07-16 19:47+0000\n"
-"Last-Translator: Fernando Casseano <Unknown>\n"
+"Last-Translator: Rafael <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:44+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -37,27 +37,27 @@ msgstr "Estado pago"
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# Pago"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Valor Agregado"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Análises de Composição"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -74,12 +74,12 @@ msgstr "Fatura a ser paga"
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "Data Final de Composição"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -94,12 +94,12 @@ msgstr "Esperando pela fatura"
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "Isto irá exibir colunas pago, antigo e total recebido"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Fornecedores"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -111,12 +111,12 @@ msgstr "Não Membros"
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Composição Básica"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Todos Membros"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
@@ -131,7 +131,7 @@ msgstr "Produto para membro"
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Inscrever-se como membro"
 
 #. module: membership
 #: field:res.partner,associate_member:0
@@ -146,12 +146,12 @@ msgstr "Membro está associado."
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mês   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Valor Pendente"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
@@ -161,28 +161,28 @@ msgstr "Parceiro associado."
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Parceiros do fornecedor"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# Faturado"
 
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Comunicação estruturada BBA inválida !"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Análise dos Membros"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Finalizar Data do Grupo"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -193,7 +193,7 @@ msgstr "Data de"
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Parceiro não possui um endereço para realizar a fatura."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -209,7 +209,7 @@ msgstr "Fatura a pagar"
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Parceiros do Cliente"
 
 #. module: membership
 #: view:res.partner:0
@@ -219,7 +219,7 @@ msgstr "Parceiros"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr "A partir de"
+msgstr "De"
 
 #. module: membership
 #: constraint:membership.membership_line:0
@@ -243,6 +243,18 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Isto indica o estado do grupo.\n"
+"                    -Não Membro: Um membro que não foi vinculado a nenhum "
+"grupo.\n"
+"                    -Membro Cancelado: Um membro que foi cancelado de seu "
+"grupo.\n"
+"                    -Membro Antigo: Um membro cujo data do grupo foi "
+"expirada.\n"
+"                    -Membro em Espera: Um membro que foi vinculado a um "
+"grupo e cuja fatura está sendo criada.\n"
+"                    -Membro Faturado: Um membro cujo fatura já foi criada.\n"
+"                    -Membro Pago: Um membro que tenha pago uma quantia de "
+"associação."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -268,12 +280,12 @@ msgstr "Data de início da associação"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Eventos criados no mês atual."
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
+msgstr "Isto irá exibir colunas aguardando, faturados e total pendente."
 
 #. module: membership
 #: code:addons/membership/membership.py:410
@@ -290,22 +302,22 @@ msgstr "Membro Pago"
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mês-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Eventos criados no ultimo mês"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "# Aguardando"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Eventos criados no ano atual"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -317,22 +329,22 @@ msgstr "Membros"
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "Faturado/Pago/Livre"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr "Abrir Fatura"
+msgstr "Abrir Fatura."
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Membro Golden"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -340,49 +352,51 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Um membro com que você queira associar seu grupo. Isso vai considerar o "
+"estado do grupo do membro associado."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Produtos do Grupo de Membros"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr "Defina o produto para a adesão."
+msgstr "Definir produto para grupo de membros."
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr "Membro faturado pode ser membro Associado."
+msgstr "Membro faturado pode ser um membro associado."
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Entrar"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Data de até quando o grupo de membros permanece ativo."
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr "Data de cancelamento de adesão"
+msgstr "Cancelar data do grupo de mebros."
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Data de Entrada"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Selecione se você quiser deixar o grupo de membros livre de custo."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -392,37 +406,37 @@ msgstr "Definir associação"
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Estado do grupo de membros"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Grupo de Membros"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr "Fatura de associação paga"
+msgstr "Fatura do grupo paga."
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Modelo de Produto"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha de Fatura"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -441,58 +455,70 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Isto indica o estado do grupo.\n"
+"                    -Não Membro: Um membro que não foi vinculado a nenhum "
+"grupo.\n"
+"                    -Membro Cancelado: Um membro que foi cancelado de seu "
+"grupo.\n"
+"                    -Membro Antigo: Um membro cujo data do grupo foi "
+"expirada.\n"
+"                    -Membro em Espera: Um membro que foi vinculado a um "
+"grupo e cuja fatura está sendo criada.\n"
+"                    -Membro Faturado: Um membro cujo fatura já foi criada.\n"
+"                    -Membro Pago: Um membro que tenha pago uma quantia de "
+"associação."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "Parceiro é um membro livre."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr "Lista de preços para venda a membro"
+msgstr "Lista de preço de venda do membro"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Associar Membro"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Data que o grupo de membros se tornou ativo."
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Parceiro Associado"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Fatura do grupo de membros"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -502,7 +528,7 @@ msgstr "Defina o produto de adesão."
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -514,7 +540,7 @@ msgstr "Membro Gratuito"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr "Versão da lista de preço para venda a membro"
+msgstr "Versão da lista de preço do membro."
 
 #. module: membership
 #: constraint:product.template:0
@@ -526,17 +552,17 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Previsão"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Membro"
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Data de"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -546,7 +572,7 @@ msgstr "Membro associado"
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Informações da Conta"
 
 #. module: membership
 #: help:report.membership,date_to:0
@@ -556,12 +582,12 @@ msgstr ""
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -573,7 +599,7 @@ msgstr "Produtos de Adesão"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -584,7 +610,7 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr "Adesão"
+msgstr "Associação"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -614,12 +640,12 @@ msgstr "Associação Parceiro"
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: membership
 #: help:product.product,membership:0
@@ -634,17 +660,17 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Descrição da venda"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: membership
 #: view:res.partner:0
@@ -686,14 +712,14 @@ msgstr "Membro Antigo"
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr "Até"
+msgstr "Para"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Estado atual da Associação"
 
 #. module: membership
 #: view:product.product:0
@@ -708,18 +734,18 @@ msgstr "A Fatura provisória agora está aberta."
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inativo"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: membership
 #: view:res.partner:0
@@ -739,7 +765,7 @@ msgstr "Linha da conta na fatura"
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorização"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -757,7 +783,7 @@ msgstr "Preço para membro"
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Descrição da compra"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
@@ -777,7 +803,7 @@ msgstr "Membro gratuito"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -793,12 +819,12 @@ msgstr ""
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0

addons/plugin_outlook/i18n/id.po

@@ -0,0 +1,74 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-07-16 09:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
+"X-Generator: Launchpad (build 15627)\n"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to create and link outlook emails with openerp "
+"objects."
+msgstr ""
+
+#. module: plugin_outlook
+#: field:outlook.installer,name:0
+msgid "Outlook Plug-in"
+msgstr ""
+
+#. module: plugin_outlook
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_wizard
+#: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Install Outlook Plug-In"
+msgstr ""
+
+#. module: plugin_outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr ""
+
+#. module: plugin_outlook
+#: model:ir.model,name:plugin_outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: plugin_outlook
+#: help:outlook.installer,name:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+
+#. module: plugin_outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr ""

addons/procurement/procurement_view.xml

@@ -55,34 +55,46 @@
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
                     <sheet>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                        <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
+                        <field name="origin" class="oe_inline"/>
+                    </h1>
                     <group>
-                        <group string="References">
+                        <group>
-                            <field name="name"/>
-                            <field name="origin"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Planification">
                             <field name="date_planned"/>
                             <field name="procure_method"/>
                             <field name="priority"/>
                         </group>
+                        <group>
+                            <field name="message"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group string="Product &amp; Location" col="4">
+                        <group>
-                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            <group>
-                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                            <field name="product_qty"/>
+                                <label for="product_qty"/>
-                            <field name="product_uom"/>
+                                <div>
-
+                                    <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uos_qty" groups="product.group_uos"/>
+                                    <field name="product_uom" class="oe_inline"/>
-                            <field name="product_uos"  groups="product.group_uos"/>
+                                </div>
+                                <label for="product_uos_qty" groups="product.group_uos"/>
+                                <div groups="product.group_uos">
+                                    <field name="product_uos_qty" class="oe_inline"/>
+                                    <field name="product_uos" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group>
+                               <field name="location_id" domain="[('usage','=','internal')]"/>
+                            </group>
                         </group>
-                        <separator string="Status"/>
-                        <field name="message"/>
                     </page>
                     <page string="Extra Information">
-                        <group string="Details" col="4">
+                        <group>
                             <field name="move_id"/>
                             <field name="date_close"/>
                             <field name="close_move"/>

addons/procurement/wizard/schedulers_all_view.xml

@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
+                    <group>
                         <field name="automatic"/>
                     </group>
                     <footer>

addons/product_expiry/product_expiry_view.xml

@@ -8,7 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <separator string="Dates" colspan="4" />
                     <field name="life_date" />
                     <field name="use_date" />
                     <field name="removal_date" />

addons/purchase/purchase.py

@@ -167,7 +167,7 @@ class purchase_order(osv.osv):
             help="Put an address if you want to deliver directly from the supplier to the customer. " \
                 "Otherwise, keep empty to deliver to your own company."
         ),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),

addons/purchase/stock.py

@@ -40,6 +40,7 @@ class stock_picking(osv.osv):
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
     }
+
     _defaults = {
         'purchase_id': False,
     }
@@ -133,5 +134,6 @@ class stock_picking_in(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
+        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/purchase/stock_view.xml

@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="//field[@name='tracking_id']" position="before">
+                 <xpath expr="//group[@name='destination_grp']" position="inside">
-                    <field name="purchase_line_id" colspan="2" />
+                    <field name="purchase_line_id"/>
                 </xpath>
             </field>
         </record>      
@@ -30,9 +30,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/sheet/group/group/field[@name='date']" position="before">
+                <xpath expr="//field[@name='date']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="warehouse_id"/>
+                </xpath>
             </field>
         </record>
         

addons/report_intrastat/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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-26 21:48+0000\n"
+"PO-Revision-Date: 2012-07-16 15:22+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:59+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -101,7 +101,7 @@ msgstr "Typ"
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr "Faktura Intrastat"
+msgstr "Instrastatfaktura"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -126,7 +126,7 @@ msgstr "Antal"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Base"
-msgstr "Grund"
+msgstr "Bas"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -136,12 +136,12 @@ msgstr "Innevarande år"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr "Januari"
+msgstr "januari"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr "Juli"
+msgstr "juli"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -159,7 +159,7 @@ msgstr "Denna månad"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr "Partner Ref."
+msgstr "Företagsref."
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -214,7 +214,7 @@ msgstr "Summa"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr "Intrastat Data"
+msgstr "Intrastatdata"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0

addons/sale/stock_view.xml

@@ -19,8 +19,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="//field[@name='tracking_id']"  position="before">
+                 <xpath expr="//group[@name='origin_grp']"  position="inside">
-                    <field name="sale_line_id" colspan="2"/>
+                    <field name="sale_line_id"/>
                 </xpath>
             </field>
         </record>

addons/share/wizard/share_wizard.py

@@ -274,7 +274,6 @@ class share_wizard(osv.TransientModel):
                 'name': new_login,
                 'groups_id': [(6,0,[group_id])],
                 'share': True,
-                'menu_tips' : False,
                 'company_id': current_user.company_id.id
             }, context)
             new_line = { 'user_id': user_id,

addons/stock/stock_view.xml

@@ -121,20 +121,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
+                    <div>
-                        <div class="oe_edit_only">
+                        <label for="name" class="oe_edit_only"/>
-                            <label for="name"  /> 
-                        </div>
                         <h1>
-                            <field name="name" placeholder="Annual inventory"/>
+                            <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
+                            <field name="date" class="oe_inline"/>
                         </h1>
                     </div>
-                <group>
                     <group>
-                        <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -150,19 +146,27 @@
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <group col="4">
+                                <group>
-                                    <field domain="[('usage','=','internal')]" name="location_id"/>
+                                    <group>
-                                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                        <field domain="[('usage','=','internal')]" name="location_id"/>
-                                    <field name="product_qty"/>
+                                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
+                                    </group>
-                                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                    <group>
-                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                        <label for="product_qty"/>
+                                        <div>
+                                            <field name="product_qty" class="oe_inline"/>
+                                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                                        </div>
+                                        <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                        <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="stock.group_inventory_valuation"
                                         type="action" icon="terp-stock_effects-object-colorize"/>
+                                    </group>
                                 </group>
                             </form>
                         </field>
-                    </page><page string="Posted Inventory">
+                    </page>
+                    <page string="Posted Inventory">
                          <field name="move_ids" context="{'inventory_id':active_id}" >
                             <tree string="Stock Moves">
                                 <field name="product_id"/>
@@ -331,18 +335,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
+                    <div class="oe_button_box oe_right">
+                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
+                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
                     <group>
-                        <group string="Serial Number Identification">
+                        <group>
                             <field name="product_id"/>
                             <field name="prefix"/>
-                            <field name="name"/>
                             <field name="ref"/>
-                            <field name="date"/>
                         </group>
-                        <group string="Traceability">
+                        <group>
+                            <field name="date"/>
                             <field name="stock_available"/>
-                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
                         </group>
                     </group>
                     <notebook>
@@ -734,7 +745,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <span attrs="{'invisible': [('origin','=',False)]}"> - </span>
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>
@@ -793,7 +804,7 @@
                                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                        <group string="Move Information">
+                                        <group>
                                             <field name="name" invisible="1"/>
                                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
                                             <label for="product_qty"/>
@@ -803,17 +814,16 @@
                                                 <button name="%(stock.move_scrap)d"
                                                         string="Scrap" type="action"
                                                         icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                                        states="draft,waiting,confirmed,assigned"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div>
+                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
                                             </div>
                                             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
                                         </group>
-
+                                        <group>
-                                        <group string="Dates">
                                             <field name="create_date" invisible="1"/>
                                             <field name="date"/>
                                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@@ -1216,14 +1226,15 @@
                 <form string="Stock Moves" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/>
+                    <button name="%(action_partial_move_server)d" string="Process Partially" type="action" states="assigned" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Entirely" type="object" class="oe_highlight"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
                     <group>
-                        <group>
+                        <group name="main_grp" string="Details">
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
@@ -1236,28 +1247,28 @@
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
-                            <label for="product_uso_qty" />
+                            <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div>
+                            <div groups="product.group_uos">
                                 <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
                                     on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
                                     class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                                <field name="product_uos" class="oe_inline"/>
                             </div>
                             <field name="name" string="Reason"/>
-                        </group>
-                        <group>
-                            <field name="picking_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group name="origin_grp" string="Origin">
+                            <field name="picking_id"/>
                             <field name="location_id" groups="stock.group_locations"/>
+                            <field name="create_date" groups="base.group_no_one"/>
+                        </group>
+                        <group name="destination_grp" string="Destination">
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
-                            <field name="create_date" groups="base.group_no_one" />
-                            <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-
+                            <field name="date" groups="base.group_no_one" />
                         </group>
-                        <group>
+                        <group string="Tracability">
                             <label for="tracking_id" groups="stock.group_tracking_lot"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
@@ -1397,77 +1408,6 @@
             </field>
         </record>
 
-
-        <record id="view_move_form_reception_picking" model="ir.ui.view">
-            <field name="name">stock.move.form2</field>
-            <field name="model">stock.move</field>
-            <field name="type">form</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Receive Products" version="7.0">
-                <header>
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                </header>
-                <sheet>
-                <group>
-                    <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <label for="product_qty"/>
-                        <div>
-                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
-                            <button name="%(stock.move_scrap)d"
-                                string="Scrap" type="action"
-                                icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        </div>
-                        <label for="product_uos_qty" groups="product.group_uos"/>
-                        <div groups="product.group_uos">
-                            <field name="product_uos_qty" class="oe_inline"
-                                on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                            <field name="product_uos" class="oe_inline"/>
-                        </div>
-                        <field name="name" string="Reason"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" groups="stock.group_locations"/>
-                    </group>
-                    <group>
-                        <field name="picking_id"/>
-                        <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" string="Move Date"/>
-                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                        <label for="tracking_id"/>
-                        <div>
-                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                            <button name="%(split_into)d" string="New Pack" type="action"
-                              groups="product.group_stock_packaging"
-                              icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done" class="oe_inline"/>
-                        </div>
-                        <label for="prodlot_id"/>
-                        <div>
-                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                context="{'location_id':location_id, 'product_id':product_id}"
-                                domain="[('product_id','=?',product_id)]" class="oe_inline"
-                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
-                            <button name="%(track_line)d"
-                                groups="stock.group_tracking_lot" class="oe_inline"
-                                states="draft,waiting,confirmed,assigned,done"
-                                string="Split" type="action" icon="terp-stock_effects-object-colorize" />
-                        </div>
-                    </group>
-                </group>
-                </sheet>
-                </form>
-            </field>
-        </record>
-
         <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
             <field name="name">stock.move.incoming.search2</field>
             <field name="model">stock.move</field>
@@ -1552,7 +1492,7 @@
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="view_id" ref="view_move_form"/>
             <field name="act_window_id" ref="action_reception_picking_move"/>
         </record>
 

addons/stock_location/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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-16 12:37+0000\n"
+"PO-Revision-Date: 2012-07-16 12:04+0000\n"
-"Last-Translator: Daniel Stenlöv (XCLUDE) <Unknown>\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n"
+"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Generator: Launchpad (build 15627)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "Du måste tilldela ett produktion batch för denna produkt"
+msgstr "Du måste tilldela ett produktionsparti för denna produkt"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0

addons/stock_planning/stock_planning_view.xml

@@ -242,10 +242,9 @@
             <field name="type">form</field>
             <field name="priority">50</field>
             <field name="arch" type="xml">
-                <form string="Stock Planning">
+                <form string="Stock Planning" version="7.0">
-                    <group colspan="4" col="7">
+                    <group>
-                        <group colspan ="3" col="2">
+                        <group string="General Info">
-                            <separator colspan ="2" string = "General Info"/>
                             <field name="company_id" widget="selection"
                                          on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
@@ -256,45 +255,48 @@
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
-                            <field name="active_uom" invisible = "True" />
+                            <field name="active_uom" invisible = "True"/>
-                            <separator colspan ="2" string = "Forecasts"/>
+                            <separator string="Current Period Situation" colspan="2"/>
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
+                            <separator string="Minimum Stock Rule Indicators" colspan="2"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                            <separator string="Forecasts" colspan="2"/>
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
                         </group>
-                        <group colspan ="2" col="2">
+ 
-                            <separator colspan ="2" string = "Current Period Situation"/>
+                        <group>
-                            <field name="stock_start"/>
+                            <button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
-                            <field name="already_out"/>
+                            <separator string="Planning and Situation for Calculated Period" colspan="2"/>
-                            <field name="already_in"/>
-                            <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
                             <field name="planned_outgoing"/>
                             <field name="outgoing"/>
                             <field name="outgoing_left"/>
                             <field name="to_procure"/>
                             <field name="incoming"/>
-                            <field name="incoming_left"/>
+                            <label for="incoming_left"/>
-                            <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
+                            <div>
+                                <field name="incoming_left" class="oe_inline"/>
+                                <button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
+                                <button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
+                            </div>
                             <field name="stock_only"/>
-                        </group>
+                            <separator string="Calculated Period Simulation" colspan="2"/>
-                        <group colspan ="2" col="2">
-                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
-                            <field name="minimum_op"/>
-                            <field name="maximum_op"/>
-                            <separator colspan ="2" string = "Calculated Period Simulation"/>
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
-                            <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
-                            <separator colspan ="2" string = "Internal Supply"/>
+                            <separator string="Internal Supply" colspan="2"/>
-                            <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
                     </group>
-                    <separator colspan ="4" string = "Procurement History"/>
+                    <group string="Procurement History" colspan="4">
-                    <field name = "history" colspan = "2" nolabel = "1"/>
+                        <field name="history" nolabel="1" colspan="4"/>
+                    </group>
                 </form>
             </field>
         </record>

addons/stock_planning/wizard/stock_planning_create_periods_view.xml

@@ -10,8 +10,12 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <group col="4">
-                        <field name="date_start"/>
+                        <label for="date_start" string="Duration"/>
-                        <field name="date_stop"/>
+                        <div>
+                            <field name="date_start"/>
+                            <label string="-"/>
+                            <field name="date_stop"/>
+                        </div>
                     </group>
                     <footer>
                         <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>

addons/stock_planning/wizard/stock_planning_createlines_view.xml

@@ -9,16 +9,16 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <group col="4">
-                        <field name="period_id" widget="selection"/>
+                        <field name="period_id"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                         <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                         <field name="forecasted_products"/>
-                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
                     </group>
                     <footer>
                         <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>