diff options
| author | Raphael Collet <rco@openerp.com> | 2015-07-06 17:01:33 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2015-07-06 17:01:33 +0200 |
| commit | b2176210d9f0749bbdcc9e8c4cd1476e8f2ebda9 (patch) | |
| tree | 39708e89570536de313e49487c0ebfe339fc370d /addons | |
| parent | f03b3e18392088bf745065294734f190f5185f9d (diff) | |
| parent | 9bd60ca93510e410a0136b8b433f596330900593 (diff) | |
Merge pull request #7202 from odoo-dev/master-i18n-rco
Make XML/HTML fields translatable like views
Add support for translating fields not as a whole, but as a value containing terms to translate:
- for such fields, the table `ir_translation` contains a set of (term, translation) for each record;
- use this support for the `arch` field of views, and convert translations of type 'view' into those;
- add "fuzzy" remapping of translations when English value of such a field is updated.
Convert translation types 'field', 'help' into corresponding translated fields of `ir.model.fields`.
Diffstat (limited to 'addons')
55 files changed, 128 insertions, 104 deletions
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index ca5143a5543..1259df6f472 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -519,7 +519,7 @@ <group expand="0" string="Group By"> <filter name="group_by_partner_id" string="Partner" context="{'group_by':'partner_id'}"/> <filter string="Salesperson" context="{'group_by':'user_id'}"/> - <filter string="Status" context="{'group_by':'state'}"/> + <filter name="status" string="Status" context="{'group_by':'state'}"/> <separator/> <filter string="Period" context="{'group_by':'date'}"/> <filter string="Due Month" context="{'group_by':'date_due'}"/> diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 2a8ea72872f..4291732688a 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -1625,7 +1625,7 @@ <form position="attributes"> <attribute name="string">Accounting Application Configuration</attribute> </form> - <group string="res_config_contents" position="replace"> + <group name="res_config_contents" position="replace"> <field name="only_one_chart_template" invisible="1"/> <field name="complete_tax_set" invisible="1"/> <group col="1"> diff --git a/addons/account/views/product_view.xml b/addons/account/views/product_view.xml index 91bab738f0a..a44b0b4b29b 100644 --- a/addons/account/views/product_view.xml +++ b/addons/account/views/product_view.xml @@ -7,7 +7,7 @@ <field name="priority">5</field> <field name="inherit_id" ref="product.product_template_form_view"/> <field name="arch" type="xml"> - <page string="Sales" position="after"> + <page name="sales" position="after"> <page string="Accounting" groups="account.group_account_invoice"> <group> <label for="categ_id" string="Internal Category"/> diff --git a/addons/auth_oauth/res_users.xml b/addons/auth_oauth/res_users.xml index feae1b16138..f9132d1eede 100644 --- a/addons/auth_oauth/res_users.xml +++ b/addons/auth_oauth/res_users.xml @@ -7,7 +7,7 @@ <field name="type">form</field> <field name="inherit_id" ref="base.view_users_form"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Access Rights']" position="after"> + <xpath expr="//page[@name='access_rights']" position="after"> <page string="Oauth"> <group> <field name="oauth_provider_id"/> diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py index 9885c24df65..f1297f96e97 100644 --- a/addons/base_gengo/ir_translation.py +++ b/addons/base_gengo/ir_translation.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.osv import fields, osv +from openerp.osv import fields, osv, api from openerp.tools.translate import _ from openerp.exceptions import UserError @@ -84,3 +84,20 @@ class ir_translation(osv.Model): """ params += ('machine', 'standard', 'ultra', 'pro',) return (query, params) + + @api.model + def _get_terms_query(self, field, records): + query, params = super(ir_translation, self)._get_terms_query(field, records) + # order translations from worst to best + query += """ + ORDER BY + CASE + WHEN gengo_translation=%s then 10 + WHEN gengo_translation=%s then 20 + WHEN gengo_translation=%s then 30 + WHEN gengo_translation=%s then 40 + ELSE 0 + END ASC + """ + params += ('machine', 'standard', 'ultra', 'pro') + return query, params diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml index ba9667d979e..5195c65abe8 100644 --- a/addons/base_gengo/ir_translation.xml +++ b/addons/base_gengo/ir_translation.xml @@ -18,7 +18,7 @@ <field name="inherit_id" ref="base.view_translation_form"/> <field name="model">ir.translation</field> <field name="arch" type="xml"> - <xpath expr="//form[@string='Translations']/sheet" position="inside"> + <xpath expr="//form/sheet" position="inside"> <group string="Gengo Translation Service" col="4" colspan="4"> <field name="gengo_translation" /> <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account"/> diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index b1d0c3344e3..1883dcc3ea8 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -12,7 +12,7 @@ <form position="attributes"> <attribute name="string">Specify Your Terminology</attribute> </form> - <group string="res_config_contents" position="replace"> + <group name="res_config_contents" position="replace"> <label string="You can use this wizard to change the terminologies for customers in the whole application."/> <separator string="Specify Your Terminology"/> <group colspan="4"> diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 6bd7155a50e..d9855c93a80 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -54,7 +54,7 @@ </div> </div> </group> - <group> + <group name="authentication"> <label for="id" string="Authentication"/> <div> <div> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 28687e0af1d..bf0258bcffe 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -182,7 +182,7 @@ <page string="Internal Notes"> <field name="description"/> </page> - <page string="Extra Info"> + <page name="extra" string="Extra Info"> <group> <group string="Mailings"> <field name="opt_out"/> @@ -196,7 +196,7 @@ <field name="medium_id"/> <field name="source_id" /> </group> - <group string="Misc"> + <group name="misc" string="Misc"> <field name="probability" groups="base.group_no_one"/> <field name="active"/> <field name="referred"/> @@ -373,7 +373,7 @@ <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/> <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/> - <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/> + <filter name="customer" string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Campaign" domain="[]" context="{'group_by':'campaign_id'}"/> <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/> <filter string="Channel" domain="[]" context="{'group_by':'medium_id'}"/> @@ -472,7 +472,7 @@ <page string="Internal Notes"> <field name="description"/> </page> - <page string="Lead"> + <page name="lead" string="Lead"> <group> <group> <field name="partner_name"/> @@ -512,7 +512,7 @@ <field name="referred"/> <field name="type" invisible="1"/> </group> - <group string="References"> + <group name="references" string="References"> <field name="ref"/> <field name="ref2"/> </group> @@ -601,7 +601,7 @@ <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/> <filter string="Country" context="{'group_by':'country_id'}" /> <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <filter string="Stage" context="{'group_by':'stage_id'}"/> + <filter name="stage" string="Stage" context="{'group_by':'stage_id'}"/> <filter string="Campaign" domain="[]" context="{'group_by':'campaign_id'}"/> <filter string="Channel" domain="[]" context="{'group_by':'medium_id'}"/> <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/> diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml index 47b00ddfd43..2c1a343350b 100644 --- a/addons/crm/sales_team_view.xml +++ b/addons/crm/sales_team_view.xml @@ -88,7 +88,7 @@ <field name="use_leads"/><label for="use_leads" string="Leads"/> <field name="use_opportunities" class="oe_inline"/><label for="use_opportunities"/> </xpath> - <xpath expr="//page[@string='Team Members']" position="after"> + <xpath expr="//page[@name='members']" position="after"> <page string="Stages"> <separator string="Select Stages for this Sales Team"/> <field name="stage_ids"/> diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index d14e7862a95..6acac6f76ab 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -7,7 +7,7 @@ <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/> <field name="arch" type="xml"> <data> - <xpath expr="//notebook/page[@string='Lead']" position="after"> + <xpath expr="//notebook/page[@name='lead']" position="after"> <page string="Assigned Partner" groups="base.group_sale_salesman"> <group name="partner_assign_group"> <group string="Partner Assignation" col="3" colspan="1"> @@ -59,7 +59,7 @@ <field name="model">crm.lead</field> <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/> <field name="arch" type="xml"> - <filter string="Stage" position="after"> + <filter name="stage" position="after"> <filter string="Assigned Partner" domain="[]" context="{'group_by':'partner_assigned_id'}"/> </filter> <filter name="unassigned" position="after"> @@ -77,7 +77,7 @@ <field name="inherit_id" ref="crm.crm_case_form_view_leads"/> <field name="arch" type="xml"> <data> - <xpath expr="//notebook/page[@string='Extra Info']" position="after"> + <xpath expr="//notebook/page[@name='extra']" position="after"> <page string="Assigned Partner" groups="base.group_sale_salesman"> <group name="partner_assign_group"> <group string="Partner Assignation" col="3"> @@ -128,7 +128,7 @@ <field name="model">crm.lead</field> <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/> <field name="arch" type="xml"> - <filter string="Customer" position="after"> + <filter name="customer" position="after"> <filter string="Assigned Partner" domain="[]" context="{'group_by':'partner_assigned_id'}"/> </filter> <filter name="unassigned" position="after"> diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index 3493b12a5b4..4843c671149 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -98,7 +98,7 @@ <field name="model">res.partner</field> <field name="inherit_id" ref="base.view_res_partner_filter"/> <field name="arch" type="xml"> - <filter string="Salesperson" position="after"> + <filter name="salesperson" position="after"> <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" /> </filter> <field name="category_id" position="after"> diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 525a5227cfe..0f44a21d47b 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -230,11 +230,11 @@ <field name="model">stock.picking</field> <field name="inherit_id" ref="stock.view_picking_form"/> <field name="arch" type="xml"> - <data> - <xpath expr="//page[@string='Additional Info']/group[last()]" position="after"> - <separator string="Carrier Information"/> - <group> - <group name='carrier_data'> + <data> + <xpath expr="//page[@name='extra']" position="inside"> + <separator string="Carrier Information"/> + <group> + <group name='carrier_data'> <field name="carrier_id"/> <field name="delivery_type" attrs="{'invisible':True}"/> <label for="carrier_tracking_ref"/> @@ -243,27 +243,27 @@ <button type='object' class="fa fa-arrow-right oe_link" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','=','grid'),('delivery_type','=',False),('state','not in',('done'))]}"/> </div> <field name="carrier_price"/> - </group> - <group> - <label for="weight" string="Weight"/> - <div> - <field name="weight" class="oe_inline"/> - <field name="weight_uom_id" nolabel="1" class="oe_inline"/> - </div> - <field name="weight_net" groups="base.group_no_one"/> - <field name="number_of_packages"/> - </group> - </group> - </xpath> - <xpath expr="//h1" position="before"> - <div class="oe_right oe_button_box"> - <button type="object" name="open_website_url" class="oe_stat_button" icon='fa-truck' string="Tracking" attrs="{'invisible': ['|',('carrier_tracking_ref','=',False),('delivery_type','=','grid')]}" /> - </div> - </xpath> - <xpath expr="//form[@string='Transfer']/header/button[last()]" position="after"> + </group> + <group> + <label for="weight" string="Weight"/> + <div> + <field name="weight" class="oe_inline"/> + <field name="weight_uom_id" nolabel="1" class="oe_inline"/> + </div> + <field name="weight_net" groups="base.group_no_one"/> + <field name="number_of_packages"/> + </group> + </group> + </xpath> + <xpath expr="//h1" position="before"> + <div class="oe_right oe_button_box"> + <button type="object" name="open_website_url" class="oe_stat_button" icon='fa-truck' string="Tracking" attrs="{'invisible': ['|',('carrier_tracking_ref','=',False),('delivery_type','=','grid')]}" /> + </div> + </xpath> + <xpath expr="/form/header/button[last()]" position="after"> <button name="send_to_shipper" string="Send to Shipper" type="object" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','!=',False),('delivery_type','=','grid'),('delivery_type','=',False),('state','not in',('done'))]}"/> - </xpath> - </data> + </xpath> + </data> </field> </record> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 7afaed118b7..8dafdc37be4 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -207,7 +207,7 @@ <field name="model">ir.attachment</field> <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> - <filter string="Owner" position="replace"> + <filter name="owner" position="replace"> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/> diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index dad1a88052e..049c3a00974 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -10,7 +10,7 @@ <form position="attributes"> <attribute name="string">Knowledge Application Configuration</attribute> </form> - <group string="res_config_contents" position="replace"> + <group name="res_config_contents" position="replace"> <separator string="Configure Directories"/> <p>Odoo's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p> <p>When executing this wizard, it will configure your directories automatically according to modules installed.</p> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index bd90a57919c..15ef033e83d 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -93,7 +93,7 @@ </group> </group> <notebook> - <page string="Registrations"> + <page name="registrations" string="Registrations"> <group> <group> <field name="auto_confirm" invisible="1"/> diff --git a/addons/event_sale/views/event.xml b/addons/event_sale/views/event.xml index f4d93ff22e0..c637b51e64f 100644 --- a/addons/event_sale/views/event.xml +++ b/addons/event_sale/views/event.xml @@ -49,7 +49,7 @@ <field name="inherit_id" ref="event.view_event_form"/> <field name="arch" type="xml"> <data> - <xpath expr="//page[@string='Registrations']" position="replace"> + <xpath expr="//page[@name='registrations']" position="replace"> <page string="Tickets"> <group> <group> diff --git a/addons/hr_gamification/views/gamification.xml b/addons/hr_gamification/views/gamification.xml index d305babc7de..ed4eb263e1e 100644 --- a/addons/hr_gamification/views/gamification.xml +++ b/addons/hr_gamification/views/gamification.xml @@ -21,7 +21,7 @@ <field name="inherit_id" ref="hr.view_employee_form"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Public Information']" position="after"> + <xpath expr="//page[@name='public']" position="after"> <page string="Received Badges" attrs="{'invisible': [('user_id', '=', False)]}"> <field name="has_badges" invisible="1"/> <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index cc5e8726494..bc8b086fd40 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -612,7 +612,7 @@ <field name="register_id"/> </group> </page> - <page string="Child Rules"> + <page name="rules" string="Child Rules"> <field name="parent_rule_id"/> <separator string="Children Definition"/> <field name="child_ids"/> diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index f45d0745e37..618261b54f8 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -22,7 +22,7 @@ <field name="model">hr.salary.rule</field> <field name="inherit_id" ref="hr_payroll.hr_salary_rule_form"/> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page[@string='Child Rules']" position="after"> + <xpath expr="/form/notebook/page[@name='rules']" position="after"> <page string="Accounting"> <group colspan="4"> <field name="account_debit" /> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 6c9114f872d..9e6450ef7aa 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -50,7 +50,7 @@ <field name="product_uom_id" class="oe_inline"/> </div> </group> - <group string="Accounting"> + <group name="accounting" string="Accounting"> <field domain="[('type','=','normal'),('state', '<>', 'close'),('parent_id','!=',False)]" name="account_id" select="1" options="{'no_open': True, 'no_create': True}"/> <field name="amount"/> <field name="general_account_id"/> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 69837e9fe72..30766544e13 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -31,7 +31,7 @@ <field name="model">account.analytic.line</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> - <xpath expr="//group[@string='Accounting']" position='after'> + <xpath expr="//group[@name='accounting']" position='after'> <group string="Invoicing"> <field name="to_invoice"/> <field name="invoice_id" readonly="1"/> diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index 6c589799d5f..822a442631f 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -36,7 +36,7 @@ <newline/> <field name="available_advice"/> </xpath> - <xpath expr="//button[@string='Set to Draft']" position="after"> + <xpath expr="//button[@name='draft_payslip_run']" position="after"> <button name="create_advice" string="Create Advice" type="object" states="close" /> </xpath> </data> @@ -197,7 +197,7 @@ <field name="inherit_id" ref="base.view_company_form"/> <field name="arch" type="xml"> <data> - <page string="Configuration" position="inside"> + <page name="configuration" position="inside"> <group name="rule" string="Payroll"> <field name="dearness_allowance"/> </group> diff --git a/addons/mail/views/res_config_views.xml b/addons/mail/views/res_config_views.xml index 441f42b5a43..189a1f4b2ea 100644 --- a/addons/mail/views/res_config_views.xml +++ b/addons/mail/views/res_config_views.xml @@ -6,7 +6,7 @@ <field name="model">base.config.settings</field> <field name="inherit_id" ref="base_setup.view_general_configuration"/> <field name="arch" type="xml"> - <xpath expr="//button[@string='Configure outgoing email servers']" position='after'> + <xpath expr="//div[@name='email.outgoing_server']/button[1]" position='after'> <button class="oe_inline oe_link" style="display: inline-block;" name= "%(action_view_mail_mail)d" type="action" context="{'search_default_exception': 1, 'search_default_outgoing': 0}" attrs="{'invisible': [('fail_counter','=',0)]}"> diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml index 97942b5561a..da3338a19fa 100644 --- a/addons/mail/views/res_partner_views.xml +++ b/addons/mail/views/res_partner_views.xml @@ -29,7 +29,7 @@ <field name="model">res.partner</field> <field name="inherit_id" ref="base.view_res_partner_filter"/> <field name="arch" type="xml"> - <filter string="Suppliers" position="after"> + <filter name="supplier" position="after"> <separator /> <filter string="Available for mass mailing" name='not_opt_out' domain="[('opt_out', '=', False)]" diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 83b8e51e002..0d53c8671b6 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -543,7 +543,7 @@ <field name="model">product.template</field> <field name="inherit_id" ref="product.product_template_search_view"/> <field name="arch" type="xml"> - <xpath expr="//filter[@string='Consumable']" position="after"> + <xpath expr="//filter[@name='consumable']" position="after"> <separator/> <filter string="Components" name="components" icon="terp-accessories-archiver" domain="[('bom_ids','not in',[])]"/> </xpath> diff --git a/addons/mrp_byproduct/mrp_byproduct_view.xml b/addons/mrp_byproduct/mrp_byproduct_view.xml index 32e8a696369..0e6b6941d0a 100644 --- a/addons/mrp_byproduct/mrp_byproduct_view.xml +++ b/addons/mrp_byproduct/mrp_byproduct_view.xml @@ -7,7 +7,7 @@ <field name="inherit_id" ref="mrp.mrp_bom_form_view"/> <field name="arch" type="xml"> <notebook position="inside"> - <page string="Byproducts" position="inside"> + <page string="Byproducts"> <field name="sub_products"> <tree string="Byproducts" editable="top"> <field name="product_id" on_change="onchange_product_id(product_id)"/> diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 9a9f5057418..a6a6876d3f7 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -146,7 +146,7 @@ <field name="model">base.config.settings</field> <field name="inherit_id" ref="base_setup.view_general_configuration"/> <field name="arch" type="xml"> - <xpath expr="//label[@string='Authentication']/.." position="after"> + <xpath expr="//group[@name='authentication']" position="after"> <group> <label for="id" string="Notes"/> <div name="note"> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index db9a92d2f62..8118cdf1c9b 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -74,7 +74,7 @@ </tree> </field> </page> - <page string="Extra Info"> + <page name="extra" string="Extra Info"> <group string="General Information"> <field name="company_id" groups="base.group_multi_company"/> <field name="location_id" widget="selection" groups="stock.group_locations"/> @@ -692,7 +692,7 @@ <field name="type" /> </tree> </field> - <group string="Features" > + <group name="features" string="Features" > <group> <field name="iface_vkeyboard" /> <field name="iface_invoicing" /> @@ -716,7 +716,7 @@ <field name="iface_electronic_scale" /> <field name="iface_cashdrawer" /> </group> - <group string="Receipt" > + <group name="receipt" string="Receipt" > <field name="receipt_header" string="Header" placeholder="A custom receipt header message"/> <field name="receipt_footer" string="Footer" placeholder="A custom receipt footer message"/> </group> diff --git a/addons/pos_discount/views/views.xml b/addons/pos_discount/views/views.xml index 18a3f65cd26..fd75259e924 100644 --- a/addons/pos_discount/views/views.xml +++ b/addons/pos_discount/views/views.xml @@ -7,10 +7,10 @@ <field name="model">pos.config</field> <field name="inherit_id" ref="point_of_sale.view_pos_config_form" /> <field name="arch" type="xml"> - <xpath expr="//group[@string='Features']/group" position="inside"> + <xpath expr="//group[@name='features']/group[1]" position="inside"> <field name='iface_discount' /> </xpath> - <xpath expr="//group[@string='Receipt']" position="after"> + <xpath expr="//group[@name='receipt']" position="after"> <group string="Discounts" col="4" > <field name='discount_pc' /> <field name="discount_product_id" /> diff --git a/addons/pos_loyalty/views/views.xml b/addons/pos_loyalty/views/views.xml index 2aa4f110727..b4b7652f8cb 100644 --- a/addons/pos_loyalty/views/views.xml +++ b/addons/pos_loyalty/views/views.xml @@ -7,7 +7,7 @@ <field name="model">pos.config</field> <field name="inherit_id" ref="point_of_sale.view_pos_config_form" /> <field name="arch" type="xml"> - <xpath expr="//group[@string='Receipt']" position="after"> + <xpath expr="//group[@name='receipt']" position="after"> <group string="Loyalty Program" col="4" > <field name="loyalty_id" /> </group> @@ -33,7 +33,7 @@ <field name="model">pos.order</field> <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Extra Info']" position="inside"> + <xpath expr="//page[@name='extra']" position="inside"> <group name="loyalty" string="Loyalty Programs"> <field name="loyalty_points" /> </group> diff --git a/addons/pos_reprint/views/views.xml b/addons/pos_reprint/views/views.xml index 44117dc74a8..8bcd70e57b7 100644 --- a/addons/pos_reprint/views/views.xml +++ b/addons/pos_reprint/views/views.xml @@ -7,7 +7,7 @@ <field name="model">pos.config</field> <field name="inherit_id" ref="point_of_sale.view_pos_config_form" /> <field name="arch" type="xml"> - <xpath expr="//group[@string='Receipt']" position="inside"> + <xpath expr="//group[@name='receipt']" position="inside"> <field string="Reprinting" name='iface_reprint' /> </xpath> </field> diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 0d1d4cb7f99..aa574d233ba 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -55,7 +55,7 @@ <field name="model">project.project</field> <field name="inherit_id" ref="project.view_project_project_filter"/> <field name="arch" type="xml"> - <xpath expr='//filter[@string="Template"]' position='after'> + <xpath expr='//filter[@name="Template"]' position='after'> <filter string="Billable" domain="[('to_invoice','!=', False)]"/> </xpath> </field> diff --git a/addons/report/views/views.xml b/addons/report/views/views.xml index 283e288621c..cec184febfd 100644 --- a/addons/report/views/views.xml +++ b/addons/report/views/views.xml @@ -99,7 +99,7 @@ <field name="model">res.company</field> <field name="arch" type="xml"> <data> - <xpath expr="//page[@string='Report Configuration']/group[@string='Configuration']" position="inside"> + <xpath expr="//page[@name='report']/group[1]" position="inside"> <field name="paperformat_id" /> </xpath> </data> diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml index 566cf29e5a8..c6f9d07ebfd 100644 --- a/addons/report_webkit/company_view.xml +++ b/addons/report_webkit/company_view.xml @@ -5,7 +5,7 @@ <field name="model">res.company</field> <field name="inherit_id" ref="base.view_company_form"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Report Configuration']/group[@string='Configuration']" position="after"> + <xpath expr="//page[@name='report']/group[1]" position="after"> <group string="Configuration (Webkit)" col="2"> <field name="header_image"/> <field name="header_webkit"/> diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml index 37260628396..b8efd3d9b8a 100644 --- a/addons/report_webkit/ir_report_view.xml +++ b/addons/report_webkit/ir_report_view.xml @@ -5,7 +5,7 @@ <field name="model">ir.actions.report.xml</field> <field name="inherit_id" ref="base.act_report_xml_view"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Security']" position="before" > + <xpath expr="//page[@name='security']" position="before" > <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}"> <group> <field name="webkit_header"/> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 00092070969..aaf3f8bd282 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -76,7 +76,7 @@ <filter string="Partner's Country" name="country_id" context="{'group_by':'country_id'}"/> <filter string="Customer" name="Customer" context="{'group_by':'partner_id'}"/> <filter string="Product Category" name="Category" context="{'group_by':'categ_id'}"/> - <filter string="Status" context="{'group_by':'state'}"/> + <filter name="status" string="Status" context="{'group_by':'state'}"/> <filter string="Company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/> <separator/> <filter string="Order Month" context="{'group_by':'date:month'}" help="Ordered date of the sales order"/> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 03c687d4f91..0058f1e055b 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -354,7 +354,7 @@ <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/> <group expand="0" string="Group By"> <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/> - <filter string="Customer" domain="[]" context="{'group_by':'partner_id'}"/> + <filter name="customer" string="Customer" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Order Month" domain="[]" context="{'group_by':'date_order'}"/> </group> </search> @@ -640,7 +640,7 @@ <xpath expr="//field[@name='user_id']" position="after"> <field name="team_id" groups="base.group_multi_salesteams"/> </xpath> - <xpath expr="//group/filter[@string='Status']" position="after"> + <xpath expr="//group/filter[@name='status']" position="after"> <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/> </xpath> </field> diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index 03c8c57bdc8..a0f4e9b72f0 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -101,7 +101,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_sales_order_filter"/> <field name="arch" type="xml"> - <xpath expr="//group/filter[@string='Customer']" position="after"> + <xpath expr="//group/filter[@name='customer']" position="after"> <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/> </xpath> </field> @@ -114,7 +114,7 @@ <field name="model">stock.picking</field> <field name="inherit_id" ref="stock.view_picking_internal_search"/> <field name="arch" type="xml"> - <xpath expr="//group/filter[@string='Picking Type']" position="after"> + <xpath expr="//group/filter[@name='picking_type']" position="after"> <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/> </xpath> </field> diff --git a/addons/sale_layout/views/sale_layout_category_view.xml b/addons/sale_layout/views/sale_layout_category_view.xml index 942c5128fea..90621502221 100644 --- a/addons/sale_layout/views/sale_layout_category_view.xml +++ b/addons/sale_layout/views/sale_layout_category_view.xml @@ -8,7 +8,7 @@ <field name="inherit_id" ref="sale.view_order_form"/> <field name="arch" type="xml"> <data> - <xpath expr="//notebook/page/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='product_id']" position="after"> + <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="after"> <field name="sale_layout_cat_id"/> </xpath> <xpath expr="//field[@name='order_line']/form/group/group/field[@name='product_id']" position="after"> @@ -25,7 +25,7 @@ <field name="inherit_id" ref="account.invoice_form"/> <field name="arch" type="xml"> <data> - <xpath expr="//page[@string='Invoice Lines']/field[@name='invoice_line_ids']/tree/field[@name='product_id']" position="after"> + <xpath expr="//page/field[@name='invoice_line_ids']/tree/field[@name='product_id']" position="after"> <field name="sale_layout_cat_id"/> </xpath> diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml index 99fd238d0c2..002a5641fc5 100644 --- a/addons/sale_mrp/sale_mrp_view.xml +++ b/addons/sale_mrp/sale_mrp_view.xml @@ -21,7 +21,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_order_form"/> <field name="arch" type="xml"> - <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='th_weight']" position="after"> + <xpath expr="//page/field[@name='order_line']/form/group/group/field[@name='th_weight']" position="after"> <field name="property_ids" widget="many2many_tags" groups="sale.group_mrp_properties"/> </xpath> diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml index 9628af9d8d1..34b3ae5d8c8 100644 --- a/addons/sale_stock/report/sale_report_view.xml +++ b/addons/sale_stock/report/sale_report_view.xml @@ -11,7 +11,7 @@ <separator/> <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/> </filter> - <xpath expr="//group/filter[@string='Status']" position="after"> + <xpath expr="//group/filter[@name='status']" position="after"> <filter string="Warehouse" context="{'group_by':'warehouse_id'}"/> </xpath> </field> diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml index fb4e9e8383e..ed081b95c20 100644 --- a/addons/sale_stock/sale_stock_view.xml +++ b/addons/sale_stock/sale_stock_view.xml @@ -62,20 +62,20 @@ <xpath expr="//group[@name='technical']" position="inside"> <field name="shipped" groups="base.group_no_one"/> </xpath> - <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="after"> + <xpath expr="//page/field[@name='order_line']/form/group/group/field[@name='tax_id']" position="after"> <label for="delay"/> <div> <field name="delay" class="oe_inline"/> days </div> </xpath> - <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before"> + <xpath expr="//page/field[@name='order_line']/form/group/group/field[@name='tax_id']" position="before"> <field name="product_tmpl_id" invisible="1"/> <field name="product_packaging" context="{'default_product_tmpl_id': product_tmpl_id, 'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_tmpl_id','=',product_tmpl_id)]" groups="product.group_stock_packaging" /> </xpath> - <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='sequence']" position="after"> + <xpath expr="//page/field[@name='order_line']/tree/field[@name='sequence']" position="after"> <field name="delay" invisible="1"/> </xpath> - <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='th_weight']" position="after"> + <xpath expr="//page/field[@name='order_line']/tree/field[@name='th_weight']" position="after"> <field name="product_packaging" invisible="1"/> </xpath> <xpath expr="//group[@name='sale_pay']" position="inside"> diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml index f8c563f1417..d0f438f52ca 100644 --- a/addons/sales_team/sales_team.xml +++ b/addons/sales_team/sales_team.xml @@ -70,7 +70,7 @@ </group> </group> <notebook colspan="4"> - <page string="Team Members"> + <page name="members" string="Team Members"> <field name="member_ids" widget="many2many_kanban"> <kanban quick_create="false" create="true" delete="true"> <field name="name"/> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index da1234ed48c..ae88eb9d88c 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -856,7 +856,7 @@ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> <filter string="Origin" domain="[]" context="{'group_by':'origin'}"/> - <filter string="Picking Type" domain="[]" context="{'group_by':'picking_type_id'}"/> + <filter name="picking_type" string="Picking Type" domain="[]" context="{'group_by':'picking_type_id'}"/> <filter string="Procurement Group" domain="[]" context="{'group_by':'group_id'}"/> </group> </search> diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml index e79bf4b4c8f..0db76a5aa67 100644 --- a/addons/stock_picking_wave/stock_picking_wave_view.xml +++ b/addons/stock_picking_wave/stock_picking_wave_view.xml @@ -120,7 +120,7 @@ <field name="model">stock.picking</field> <field name="inherit_id" ref="stock.view_picking_internal_search"/> <field name="arch" type="xml"> - <xpath expr="//filter[@string='Picking Type']" position="after"> + <xpath expr="//filter[@name='picking_type']" position="after"> <filter string="Wave" domain="[]" context="{'group_by':'wave_id'}"/> </xpath> </field> diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index f300487e7b8..9f01f71b2a0 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -253,7 +253,8 @@ class Website(openerp.addons.web.controllers.main.Home): old_trans = irt.search_read( request.cr, request.uid, [ - ('type', '=', 'view'), + ('type', '=', 'model'), + ('name', '=', 'ir.ui.view,arch_db'), ('res_id', '=', view_id), ('lang', '=', lang), ('src', '=', initial_content), @@ -261,15 +262,16 @@ class Website(openerp.addons.web.controllers.main.Home): if old_trans: tid = old_trans[0]['id'] if tid: - vals = {'value': new_content} + vals = {'value': new_content, 'state': 'translated'} irt.write(request.cr, request.uid, [tid], vals) else: new_trans = { - 'name': 'website', + 'type': 'model', + 'name': 'ir.ui.view,arch_db', + 'state': 'translated', 'res_id': view_id, 'lang': lang, - 'type': 'view', - 'source': initial_content, + 'src': initial_content, 'value': new_content, } if t.get('gengo_translation'): diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml index b0002e61b29..04e67dd7ed1 100644 --- a/addons/website/views/res_config.xml +++ b/addons/website/views/res_config.xml @@ -25,7 +25,7 @@ </div> </div> </group> - <group string="Social Media"> + <group name="social" string="Social Media"> <label for="social_twitter"/> <div name="social_twitter"> <div class="oe_inline"> diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml index ebb1728bf46..58c13347619 100644 --- a/addons/website/views/website_views.xml +++ b/addons/website/views/website_views.xml @@ -23,7 +23,7 @@ <button string="Cancel" type="object" name="noop" class="oe_link"/> </header> <div name="domain"> - <separator string="Domain"/> + <separator name="domain" string="Domain"/> <group name="domain"> <field name="name"/> <field name="domain"/> diff --git a/addons/website_crm_score/views/sales.xml b/addons/website_crm_score/views/sales.xml index 08045f9e38e..b4518eec4ef 100644 --- a/addons/website_crm_score/views/sales.xml +++ b/addons/website_crm_score/views/sales.xml @@ -51,7 +51,7 @@ <field name="priority" position="after"> <field name="score" /> </field> - <xpath expr="//group[@string='Misc']" position="after"> + <xpath expr="//group[@name='misc']" position="after"> <group string="Scoring"> <field name="score_ids" widget="many2many_tags" @@ -84,7 +84,7 @@ <field name="user_id" position="after"> <field name="score" /> </field> - <xpath expr="//group[@string='References']" position="after"> + <xpath expr="//group[@name='references']" position="after"> <group string="Scoring"> <field name="score_ids" widget="many2many_tags" @@ -169,7 +169,7 @@ </div> <field name="min_for_assign" class="oe_inline"/> </xpath> - <xpath expr="//page[@string='Team Members']" position="replace"> + <xpath expr="//page[@name='members']" position="replace"> <page string="Assignation"> <field name="team_user_ids" widget="one2many" mode="kanban" context="{'default_team_id':active_id, 'ro_team':True}"> <kanban> diff --git a/addons/website_livechat/views/res_config.xml b/addons/website_livechat/views/res_config.xml index ac69929ca63..178cb20ae27 100644 --- a/addons/website_livechat/views/res_config.xml +++ b/addons/website_livechat/views/res_config.xml @@ -7,7 +7,7 @@ <field name="model">website.config.settings</field> <field name="inherit_id" ref="website.view_website_config_settings"/> <field name="arch" type="xml"> - <xpath expr="//group[@string='Social Media']" position="inside"> + <xpath expr="//group[@name='social']" position="inside"> <label for="channel_id"/> <div name="channel_id"> <div class="oe_inline"> diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml index a1cb0b8112e..fc8449a90a6 100644 --- a/addons/website_quote/views/website_quotation_backend.xml +++ b/addons/website_quote/views/website_quotation_backend.xml @@ -17,7 +17,7 @@ <xpath expr="//header/button[@name='print_quotation'][1]" position="replace"> <button name="print_quotation" string="Print" type="object" states="draft" groups="base.group_user"/> </xpath> - <xpath expr="//page[@string='Order Lines']" position="after"> + <xpath expr="//page/field[@name='order_line']/.." position="after"> <page string="Suggested Products"> <label string="Optional Products & Services" for="options"/> <field name="quote_viewed" invisible="1"/> diff --git a/addons/website_slides/view/res_config.xml b/addons/website_slides/view/res_config.xml index 152041c86ce..0c9be892a59 100644 --- a/addons/website_slides/view/res_config.xml +++ b/addons/website_slides/view/res_config.xml @@ -7,7 +7,7 @@ <field name="model">website.config.settings</field> <field name="inherit_id" ref="website.view_website_config_settings"/> <field name="arch" type="xml"> - <xpath expr="//group[@string='Social Media']" position="after"> + <xpath expr="//group[@name='social']" position="after"> <group string="Website Slides"> <field name="website_slide_google_app_key" /> </group> diff --git a/addons/website_version/models/ir_ui_view.py b/addons/website_version/models/ir_ui_view.py index 94fa6cab45e..4a3ded70f43 100644 --- a/addons/website_version/models/ir_ui_view.py +++ b/addons/website_version/models/ir_ui_view.py @@ -170,7 +170,12 @@ class view(models.Model): for v in view_list: views = self.customize_template_get(v.id, full=True) views_ids += [v.get('id') for v in views if v.get('active')] - domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)] + domain = [ + ('type', '=', 'model'), + ('name', '=', 'ir.ui.view,arch_db'), + ('res_id', 'in', views_ids), + ('lang', '=', lang), + ] element_list = irt.search_read(self.env.cr, self.env.uid, domain, field, context=self.env.context) for element in element_list: diff --git a/addons/website_version/views/website_version_views.xml b/addons/website_version/views/website_version_views.xml index 5ad886dd71e..d20682d3c87 100644 --- a/addons/website_version/views/website_version_views.xml +++ b/addons/website_version/views/website_version_views.xml @@ -62,7 +62,7 @@ <field name="company_id"/> <field name="user_id" context="{'active_test': False}"/> </field> - <separator string="Domain" position="replace"> + <separator name="domain" position="replace"> <separator string="Statistics"/> </separator> |