diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index f86d5f3a359..f06a456037f 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -23,15 +23,15 @@ - - + + - - - + + + - + tree,form Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year. - + @@ -923,8 +923,8 @@ The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes. - - + + - + @@ -77,7 +77,7 @@ tree,form - + @@ -111,7 +111,7 @@ form tree,form - + @@ -148,7 +148,7 @@ form tree,form - + @@ -180,7 +180,7 @@ form tree,form - + @@ -212,7 +212,7 @@ form tree,form - + diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml index 062349f7716..f51120aa9da 100644 --- a/addons/account_invoice_layout/account_invoice_layout_view.xml +++ b/addons/account_invoice_layout/account_invoice_layout_view.xml @@ -112,7 +112,7 @@ - + diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 00c4b15b252..71856dcf703 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -93,7 +93,7 @@ - + payment.order.form diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 584bc46ab34..65b37fb4c1d 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -1,9 +1,9 @@ - + parent="base.menu_base_config" sequence="20" />--> diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 16064762f9b..8ef4310d478 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -159,7 +159,7 @@ + parent="base.menu_base_config" sequence="50" groups="base.group_sale_manager" /> @@ -215,9 +215,9 @@ + parent="base.menu_calendar_configuration" sequence="5"/> @@ -350,9 +350,9 @@ - - - + + + @@ -501,7 +501,7 @@ + sequence="15" action="action_view_event" /> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index a97cfe21bad..cc8630aa30a 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -24,7 +24,7 @@ @@ -42,7 +42,7 @@ + parent="base.menu_crm_config_lead" sequence="1" groups="base.group_no_one"/> diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 527f5814be4..d02d51534ef 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -15,7 +15,7 @@ @@ -167,9 +167,9 @@ - - - + + + diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 34ef2612623..8365399d9f3 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -15,7 +15,7 @@ + id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" groups="base.group_no_one"/> @@ -88,7 +88,7 @@ icon="terp-partner" name="%(action_crm_phonecall2partner)d" type="action" - attrs="{'invisible':[('partner_id','!=',False)]}" + attrs="{'invisible':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/> search - + - + @@ -15,11 +15,13 @@ parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/> + parent="base.menu_base_config" sequence="45" groups="base.group_extended"/> + + @@ -52,7 +54,7 @@ Track from where is coming your leads and opportunities by creating specific channels that will be maintained at the creation of a document in the system. Some examples of channels can be: Website, Phone Call, Reseller, etc. - + @@ -126,8 +128,8 @@ + id="menu_crm_case_section_act" sequence="15" + parent="base.menu_sales_configuration_misc" groups="base.group_no_one"/> @@ -246,7 +248,7 @@ @@ -371,8 +373,8 @@ + groups="base.group_extended" sequence="15" + parent="base.menu_base_config" /> view.users.form.crm.modif.inherited1 diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index fde63a3a367..ab39d5e7015 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_base_config" sequence="55" /> @@ -19,7 +19,7 @@ + id="menu_crm_case_claim-act" parent="menu_config_claim" groups="base.group_no_one"/> @@ -261,7 +261,7 @@ False - + res.partner.claim.info.form res.partner @@ -279,7 +279,7 @@ - + + parent="base.menu_base_config" sequence="65" /> @@ -19,7 +19,7 @@ diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 3f0d69eacc1..96dbb74e866 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_base_config" sequence="60" /> @@ -19,7 +19,7 @@ + id="menu_crm_case_helpdesk-act" parent="menu_config_helpdesk" groups="base.group_no_one"/> @@ -206,7 +206,7 @@ search - @@ -226,7 +226,7 @@ help="Todays's Helpdesk Requests" /> @@ -239,7 +239,7 @@ domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> - + tree,form - + @@ -69,7 +69,7 @@ form diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml index a54d3d4b0a9..9330f20ee0c 100644 --- a/addons/crm_profiling/crm_profiling_view.xml +++ b/addons/crm_profiling/crm_profiling_view.xml @@ -10,8 +10,8 @@ You can create specific topic-related questionnaires to guide your team(s) in the sales cycle by helping them to ask the right questions. The segmentation tool allows you to automatically assign a partner to a category according to his answers to the different questionnaires. - + Questions @@ -20,8 +20,8 @@ tree,form - + diff --git a/addons/crm_todo/i18n/fi.po b/addons/crm_todo/i18n/fi.po new file mode 100644 index 00000000000..10a17f7f87f --- /dev/null +++ b/addons/crm_todo/i18n/fi.po @@ -0,0 +1,96 @@ +# Finnish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-26 09:38+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n" +"X-Generator: Launchpad (build 15011)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Tehtävä" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Aikaikkuna" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "Peruuttaaksesi tehtävän" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "seuraava" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "Omat tehtävät" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Tehtävät" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Valmis" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Peruuta" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Lisätiedot" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "Liidi / mahdollisuus" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "Vaihtaaksesi valmis tilaan" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "edellinen" diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 1e47d815084..2d97d89dfca 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -1,7 +1,7 @@ - + delivery.carrier.tree @@ -81,7 +81,7 @@ Define your delivery methods and their pricing. The delivery costs can be added on the sale order form or in the invoice, based on the delivery orders. - + @@ -131,7 +131,7 @@ tree,form The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range. - + delivery.grid.line.form diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index b9b577a0f03..a0b956790af 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -41,7 +41,7 @@ form - + diff --git a/addons/google_base_account/i18n/it.po b/addons/google_base_account/i18n/it.po new file mode 100644 index 00000000000..82c3e8b6c0e --- /dev/null +++ b/addons/google_base_account/i18n/it.po @@ -0,0 +1,121 @@ +# Italian 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-26 09:15+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n" +"X-Generator: Launchpad (build 15011)\n" + +#. module: google_base_account +#: field:res.users,gmail_user:0 +msgid "Username" +msgstr "Nome utente" + +#. module: google_base_account +#: model:ir.actions.act_window,name:google_base_account.act_google_login_form +msgid "Google Login" +msgstr "Login Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "Google Contacts Import Error!" +msgstr "Errore nell'importazione dei contatti da Google!" + +#. module: google_base_account +#: view:res.users:0 +msgid " Synchronization " +msgstr " Sincronizzazione " + +#. module: google_base_account +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Non è possibile avere due utenti con lo stesso login !" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Error" +msgstr "Errore" + +#. module: google_base_account +#: view:google.login:0 +msgid "Google login" +msgstr "Login Google" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: google_base_account +#: field:google.login,password:0 +msgid "Google Password" +msgstr "Password Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Cancel" +msgstr "_Annulla" + +#. module: google_base_account +#: view:res.users:0 +msgid "Google Account" +msgstr "Account Google" + +#. module: google_base_account +#: field:google.login,user:0 +msgid "Google Username" +msgstr "Nome Utente Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "" +"Please install gdata-python-client from http://code.google.com/p/gdata-" +"python-client/downloads/list" +msgstr "" +"Prego installare gdata-python-client da http://code.google.com/p/gdata-" +"python-client/downloads/list" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_google_login +msgid "Google Contact" +msgstr "Contatto Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Login" +msgstr "_Accedi" + +#. module: google_base_account +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "L'azienda scelta non è fra la aziende abilitate per questo utente" + +#. module: google_base_account +#: field:res.users,gmail_password:0 +msgid "Password" +msgstr "Password" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Authentication fail check the user and password !" +msgstr "Autenticazione fallita, controlla il nome utente e la password !" + +#. module: google_base_account +#: view:google.login:0 +msgid "ex: user@gmail.com" +msgstr "es: user@gmail.com" diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index a48103ad2e0..0171b41e881 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -55,7 +55,7 @@ Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc. - + res.users.form diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 9ece120f0f0..f81a9610fa1 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -8,7 +8,7 @@ groups="base.group_hr_manager,base.group_hr_user,base.group_user"/> - + @@ -314,7 +314,7 @@ + parent="hr.menu_hr_configuration" sequence="1"/> Categories structure @@ -341,7 +341,7 @@ + id="menu_view_employee_category_tree" parent="menu_hr_management" sequence="2"/> hr.job.form @@ -435,7 +435,7 @@ - + diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 7e600ba3619..258177bfd5e 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -117,9 +117,9 @@ - + sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance" + groups="base.group_no_one"/> + hr.employee.form1 diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 5a4f84a9692..9e0017fed8c 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -2,7 +2,7 @@ - + hr.hr.employee.view.form2 hr.employee diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 11f247a1ad5..e38a8796895 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -64,8 +64,8 @@ - + hr_evaluation.plan.phase.form diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index c01bfe99ad3..9be2b2bbb31 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -12,7 +12,7 @@ - + - + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index a860b33f4b0..e0212a68646 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -2,8 +2,9 @@ + + - @@ -138,8 +139,8 @@ Salary Structures Hierarchy @@ -670,7 +671,7 @@ - + + sequence="40" /> # ------------------------------------------------------ # Job Categories @@ -461,7 +461,7 @@ name="Degrees" parent="menu_hr_recruitment_recruitment" action="hr_recruitment_degree_action" - sequence="1"/> + sequence="5" groups="base.group_no_one"/> @@ -495,7 +495,7 @@ id="menu_hr_recruitment_source" parent="menu_hr_recruitment_recruitment" action="hr_recruitment_source_action" - sequence="1"/> + sequence="10" groups="base.group_no_one"/> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 3190b8910ae..b645d703032 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -185,7 +185,7 @@ + parent="account.menu_configuration_misc" sequence="25" groups="base.group_no_one"/> diff --git a/addons/import_base/i18n/fi.po b/addons/import_base/i18n/fi.po new file mode 100644 index 00000000000..39e9dcd8fca --- /dev/null +++ b/addons/import_base/i18n/fi.po @@ -0,0 +1,104 @@ +# Finnish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-26 06:59+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n" +"X-Generator: Launchpad (build 15011)\n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:434 +#, python-format +msgid "Import failed due to an unexpected error" +msgstr "Tuonti epäonnistui tuntemattoman virheen takia" + +#. module: import_base +#: code:addons/import_base/import_framework.py:461 +#, python-format +msgid "started at %s and finished at %s \n" +msgstr "aloitettu %s ja valmistui %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:448 +#, python-format +msgid "Import of your data finished at %s" +msgstr "Tietojen tuonti valmistui %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:463 +#, python-format +msgid "" +"but failed, in consequence no data were imported to keep database " +"consistency \n" +" error : \n" +msgstr "" +"mutta epäonnistui, tietojen yhtenäisyyden säilyttämiseksi tietoja ei tuotu \n" +" virhe: \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:477 +#, python-format +msgid "" +"The import of data \n" +" instance name : %s \n" +msgstr "" +"Tietojen tuonti \n" +" Instanssin nimi: %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:470 +#, python-format +msgid "%s has been successfully imported from %s %s, %s \n" +msgstr "%s on onnistuneesti tuotu %s %s, %s :stä \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:447 +#, python-format +msgid "Data Import failed at %s due to an unexpected error" +msgstr "Tietojen tuonti epäonnistui %s:ssä tuntemattoman virheen takia" + +#. module: import_base +#: code:addons/import_base/import_framework.py:436 +#, python-format +msgid "Import finished, notification email sended" +msgstr "Tuonti valmis, muistutussähköposti on lähetety" + +#. module: import_base +#: code:addons/import_base/import_framework.py:190 +#, python-format +msgid "%s is not a valid model name" +msgstr "%s ei ole sallittu mallin nimi" + +#. module: import_base +#: model:ir.ui.menu,name:import_base.menu_import_crm +msgid "Import" +msgstr "Tuo" + +#. module: import_base +#: code:addons/import_base/import_framework.py:467 +#, python-format +msgid "with no warning" +msgstr "ei varoituksia" + +#. module: import_base +#: code:addons/import_base/import_framework.py:469 +#, python-format +msgid "with warning : %s" +msgstr "varoituksella : %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:191 +#, python-format +msgid " fields imported : " +msgstr " Tuodut kentät : " diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml index 361f52746ce..27a6f7f710e 100644 --- a/addons/l10n_br/l10n_br_view.xml +++ b/addons/l10n_br/l10n_br_view.xml @@ -74,7 +74,7 @@ - + \ No newline at end of file diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index d2d8537cd4c..f96147e9344 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -110,11 +110,11 @@ + parent="menu_mrp_property" groups="base.group_no_one"/> + id="menu_mrp_property_group_action" groups="base.group_no_one"/> diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 37b924f319f..a267dc24e8f 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -66,8 +66,8 @@ {'menu':True} - - + + diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 3b4107c8358..f7971f1f981 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -61,8 +61,8 @@ automatic - - + + diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 518a8900072..6ce26ecb98c 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -273,7 +273,7 @@ - + diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 3ddfe1e6900..3b8eeb750cf 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -4,7 +4,7 @@ - + product.pricelist.version.form @@ -180,7 +180,7 @@ + parent="base.menu_base_config" sequence="20"/> product.price.type.form @@ -195,7 +195,7 @@ - + Price Types ir.actions.act_window @@ -206,7 +206,7 @@ + parent="product.menu_product_pricelist_main" sequence="4" groups="base.group_no_one"/> diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index b14b94ef315..2527f2e4f97 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -68,7 +68,7 @@ + parent="base.menu_config_address_book" sequence="2" groups="base.group_no_one"/> diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml index 3d7a554ff4a..012576ebf7d 100644 --- a/addons/sale/edi/sale_order_action_data.xml +++ b/addons/sale/edi/sale_order_action_data.xml @@ -21,8 +21,7 @@ - - + @@ -47,9 +46,9 @@

Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},

- +

Here is your order confirmation for ${object.partner_id.name}:

- +

  REFERENCES
  Order number: ${object.name}
@@ -67,7 +66,7 @@

You can view the order confirmation document, download it and pay online using the following link:

- View Order % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account: @@ -146,7 +145,7 @@ You can view the order confirmation, download it and even pay online using the f ${ctx.get('edi_web_url_view') or 'n/a'} % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account: -<% +<% comp_name = quote(object.company_id.name) order_name = quote(object.name) paypal_account = quote(object.company_id.paypal_account) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 50d486dcac9..5cf3781478b 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -46,7 +46,7 @@ If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales. - + sale.order.calendar diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index a320a55d02b..3979318e299 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -43,8 +43,8 @@ Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc. - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 320ade8ec2d..2a9ef83062e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -13,26 +13,26 @@ parent="stock.menu_stock_product" sequence="0"/> - + + parent="stock.menu_stock_configuration" sequence="45" groups="base.group_no_one"/> + parent="stock.menu_product_in_config_stock" sequence="0" /> + parent="stock.menu_product_in_config_stock" sequence="35"/> + parent="menu_stock_configuration" sequence="30"/> + parent="menu_stock_configuration" sequence="35"/> stock.inventory.line.tree @@ -586,7 +586,7 @@ {'search_default_in_location':1} Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations. - + stock.location.tree @@ -651,7 +651,7 @@ Create and manage your warehouses and assign them a location from here - + stock.picking.calendar @@ -1787,7 +1787,7 @@ tree,form - + + parent="menu_warehouse_config" sequence="1"/> Stock Management diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 1dc6b88e3fc..3ce0184eb00 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -69,9 +69,9 @@ + sequence = "25"/> stock.sale.forecast.form diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml index 42730dc8ace..c2658a7b5a5 100644 --- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml +++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml @@ -34,8 +34,8 @@ + sequence = "20"/>