diff options
Diffstat (limited to 'addons')
98 files changed, 167 insertions, 292 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 07034df56e4..e33d8ea476e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -294,6 +294,10 @@ <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/> <field name="number" readonly="1" class="oe_inline"/> </h1> + <label string="Concerns" for="name" class="oe_edit_only"/> + <h2> + <field name="name" placeholder="Project XYZ"/> + </h2> <field name="type" invisible="1"/> <group> <group> diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index 254928ab7dc..94061548a89 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -39,7 +39,6 @@ delete on objects and can check logs. 'wizard/audittrail_view_log_view.xml', 'audittrail_view.xml', 'security/ir.model.access.csv', - 'security/audittrail_security.xml' ], 'demo_xml': ['audittrail_demo.xml'], 'installable': True, diff --git a/addons/audittrail/security/audittrail_security.xml b/addons/audittrail/security/audittrail_security.xml deleted file mode 100644 index 8c2c0d863e0..00000000000 --- a/addons/audittrail/security/audittrail_security.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data noupdate="0"> - <!-- Set access to menu --> - </data> -</openerp> - diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml index 61fc8d79131..fb690ceff5d 100644 --- a/addons/base_module_record/wizard/base_module_record_object_view.xml +++ b/addons/base_module_record/wizard/base_module_record_object_view.xml @@ -138,7 +138,7 @@ <group colspan="4" col="2"> <label string=""/> <button icon="gtk-close" string="Close" special="cancel"/> - </group> + </group> </form> </field> </record> diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml index e8c0de95513..f03e13499af 100644 --- a/addons/board/board_mydashboard_view.xml +++ b/addons/board/board_mydashboard_view.xml @@ -7,7 +7,7 @@ <field name="model">board.board</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="My Dashboard" version="7.0"> + <form string="My Dashboard" version="7.0"> <board style="2-1"> <column> </column> diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index de64729f241..a733ef511f9 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -20,7 +20,7 @@ <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" /> - <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/> + <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/> <!-- crm.case.channel --> diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 49e285425cd..828d137dcaf 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -42,10 +42,8 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Convert to Opportunity"> - <field name="action"/> <field name="name" colspan="4"/> - <separator string="Assigned Opportunities to" colspan="4" /> <field name="section_id" /> <group col="4" colspan="4"> @@ -61,7 +59,6 @@ <button special="cancel" string="Cancel" icon="gtk-cancel"/> <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok"/> </group> - </form> </field> </record> diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml index 7cfedb40838..497461335b6 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml +++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml @@ -9,7 +9,7 @@ <field name="model">crm.opportunity2phonecall</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Schedule/Log a Call" version="7.0"> + <form string="Schedule/Log a Call" version="7.0"> <header> <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" /> <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" /> diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index a87835aa261..fa304fe443d 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -75,7 +75,7 @@ <field name="stage_id"/> <field name="date_action_next"/> <field name="action_next"/> - <field name="categ_id" string="Type" /> + <field name="categ_id" string="Type"/> <field name="date_deadline" invisible="1"/> <field name="date_closed" invisible="1"/> <field name="state" groups="base.group_no_one"/> @@ -107,7 +107,7 @@ <field name="stage_id" widget="statusbar" on_change="onchange_stage_id(stage_id)"/> </header> - <sheet string="Claims" > + <sheet string="Claims"> <group> <field name="name" /> <field name="date"/> diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index b3284dce889..988697b4eb8 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -71,7 +71,7 @@ <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" /> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> </header> - <sheet string="Funds Form" > + <sheet string="Funds Form"> <group col="4"> <field name="name" string="Name"/> <field name="section_id" colspan="1" widget="selection"/> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index a5fe6c251a5..79b7c04c3c9 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -44,7 +44,7 @@ states="draft,open,pending"/> <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> </header> - <sheet string="Helpdesk Support" > + <sheet string="Helpdesk Support"> <group col="4" class="oe_header"> <field name="name" string="Query"/> <field name="section_id" widget="selection"/> diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index 0e183cedb86..c45002c085c 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -27,7 +27,7 @@ <group string="Geo Assignation"> <field name="partner_latitude"/> <field name="partner_longitude"/> - <span/> + <span/> <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1" icon="gtk-apply"/> </group> diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml index 3de1cf59d25..b779e54bf17 100644 --- a/addons/crm_profiling/crm_profiling_view.xml +++ b/addons/crm_profiling/crm_profiling_view.xml @@ -31,8 +31,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Questionnaires"> - <field name="name" colspan="4"/> - <field name="description" colspan="4"/> + <field name="name" colspan="4"/> + <field name="description" colspan="4"/> <field name="questions_ids" colspan="4" nolabel="1"/> </tree> </field> @@ -46,13 +46,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Questionnaires"> - <field name="name" /> + <field name="name"/> <newline/> <separator string="Questions List" colspan="4"/> <field name="questions_ids" colspan="4" nolabel="1"/> <newline/> <separator string="Description" colspan="4"/> - <field name="description" colspan="4" nolabel="1"/> + <field name="description" colspan="4" nolabel="1"/> </form> </field> </record> @@ -65,8 +65,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Answers"> - <field name="question_id" /> - <field name="name" /> + <field name="question_id"/> + <field name="name"/> </tree> </field> </record> @@ -79,8 +79,8 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Answers"> - <field name="question_id" /> - <field name="name" /> + <field name="question_id"/> + <field name="name"/> </form> </field> </record> @@ -93,7 +93,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Questions"> - <field name="name" colspan="4"/> + <field name="name" colspan="4"/> <field name="answers_ids" colspan="4" nolabel="1"/> </tree> </field> @@ -108,15 +108,15 @@ <field name="arch" type="xml"> <form string="Questions"> <newline/> - <field name="name" /> + <field name="name"/> <newline/> <separator string="Avalaible Answers" colspan="4"/> <field name="answers_ids" colspan="4" nolabel="1"> <tree string="Answers" editable="bottom"> - <field name="name" /> + <field name="name"/> </tree> <form string="Answers"> - <field name="name" /> + <field name="name"/> </form> </field> </form> @@ -153,7 +153,7 @@ <notebook> <page string="Segmentation"> <separator string="Segmentation Description" colspan="4"/> - <field name="name" /> + <field name="name"/> <field name="exclusif"/> <newline/> <field name="categ_id" colspan="2"/> diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml deleted file mode 100644 index 14710cf8f37..00000000000 --- a/addons/document/custom_report.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data> - - </data> -</openerp> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index dda52256aa9..6fb99d936d4 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -93,7 +93,7 @@ </group> <group col="4"> <field name="ressource_parent_type_id"/> - <field name="ressource_id" readonly="1"/> + <field name="ressource_id" readonly="1"/> </group> <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}"> <field name="resource_find_all"/> diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 16868469df1..98016d2fee2 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -7,10 +7,10 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Files"> - <field name="name" /> - <field name="user" /> - <field name="directory" /> - <field name="datas_fname" /> + <field name="name"/> + <field name="user"/> + <field name="directory"/> + <field name="datas_fname"/> <field name="file_size"/> <field name="create_date"/> </form> @@ -24,10 +24,10 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Files"> - <field name="name" /> - <field name="month" /> - <field name="user" invisible="1"/> - <field name="directory" invisible="1"/> + <field name="name"/> + <field name="month"/> + <field name="user" invisible="1"/> + <field name="directory" invisible="1"/> <field name="file_size" invisible="1"/> <field name="create_date" invisible="1"/> <field name="nbr"/> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 56a9a2fd75f..30eeb01b4f1 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -120,7 +120,7 @@ <group col="8" colspan="4"> <separator string="" colspan="4"/> <newline/> - <field name="state" colspan="2"/> + <field name="state" colspan="2"/> <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> @@ -360,9 +360,9 @@ <button name="button_reg_close" string="Attended" states="open" type="object"/> <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/> - <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/> + <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/> </header> - <sheet string="Registration" > + <sheet string="Registration"> <group col="6" colspan="4"> <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/> <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/> diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po index d36db01dc6e..dd01372b21b 100644 --- a/addons/google_map/i18n/ar.po +++ b/addons/google_map/i18n/ar.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "خريطة جوجل" @@ -29,7 +28,6 @@ msgstr "عناوين الشريك" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "شارع 2: " diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po index 76c6284dc1f..157a3019bc4 100644 --- a/addons/google_map/i18n/bg.po +++ b/addons/google_map/i18n/bg.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Карта" @@ -29,7 +28,6 @@ msgstr "Адрес на партньора" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Улица2 : " diff --git a/addons/google_map/i18n/br.po b/addons/google_map/i18n/br.po index 4930e3dc8c1..ace8987aaec 100644 --- a/addons/google_map/i18n/br.po +++ b/addons/google_map/i18n/br.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kartenn" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Straed2 : " diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po index d089af0dc6c..a9adaf6b16d 100644 --- a/addons/google_map/i18n/bs.po +++ b/addons/google_map/i18n/bs.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "" @@ -29,7 +28,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po index 34d8f593f44..34beec64348 100644 --- a/addons/google_map/i18n/ca.po +++ b/addons/google_map/i18n/ca.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "Adreces d'empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Carrer2 : " diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po index 576ef5c8708..f678673ae99 100644 --- a/addons/google_map/i18n/cs.po +++ b/addons/google_map/i18n/cs.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "Adresy partnerů" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulice2 " diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po index 001a68f0161..c33f013643e 100644 --- a/addons/google_map/i18n/da.po +++ b/addons/google_map/i18n/da.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kort" @@ -30,7 +29,6 @@ msgstr "Partneradresser" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Gade2: " diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po index 5bbe763f64b..e348a3f74be 100644 --- a/addons/google_map/i18n/de.po +++ b/addons/google_map/i18n/de.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Karte" @@ -29,7 +28,6 @@ msgstr "Partner Adressen" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Strasse2: " diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po index 5d366528922..b1285ecdbb2 100644 --- a/addons/google_map/i18n/el.po +++ b/addons/google_map/i18n/el.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Χάρτης" @@ -30,7 +29,6 @@ msgstr "Διεύθυνση Συνεργάτη" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Οδός 2: " diff --git a/addons/google_map/i18n/en_GB.po b/addons/google_map/i18n/en_GB.po index 9d7477d94eb..1bb554f0f46 100644 --- a/addons/google_map/i18n/en_GB.po +++ b/addons/google_map/i18n/en_GB.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Map" @@ -30,7 +29,6 @@ msgstr "Partner Addresses" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Street2 : " diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po index aa3a67c7b91..f4439eb59a4 100644 --- a/addons/google_map/i18n/es.po +++ b/addons/google_map/i18n/es.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "Direcciones de empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po index a96a10865a4..ff160cc6c89 100644 --- a/addons/google_map/i18n/es_AR.po +++ b/addons/google_map/i18n/es_AR.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle 2 : " diff --git a/addons/google_map/i18n/es_CR.po b/addons/google_map/i18n/es_CR.po index 2928af73814..1ef8e3ebe66 100644 --- a/addons/google_map/i18n/es_CR.po +++ b/addons/google_map/i18n/es_CR.po @@ -20,7 +20,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -31,7 +30,6 @@ msgstr "Direcciones de empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/es_EC.po b/addons/google_map/i18n/es_EC.po index 22395b966bf..5bcac27c130 100644 --- a/addons/google_map/i18n/es_EC.po +++ b/addons/google_map/i18n/es_EC.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "Direcciones de empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/es_MX.po b/addons/google_map/i18n/es_MX.po index 0e681627cae..781923eff72 100644 --- a/addons/google_map/i18n/es_MX.po +++ b/addons/google_map/i18n/es_MX.po @@ -19,13 +19,11 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/es_PY.po b/addons/google_map/i18n/es_PY.po index 22d5cef1675..d34ae9799d8 100644 --- a/addons/google_map/i18n/es_PY.po +++ b/addons/google_map/i18n/es_PY.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "Direcciones de empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/es_VE.po b/addons/google_map/i18n/es_VE.po index 0e681627cae..781923eff72 100644 --- a/addons/google_map/i18n/es_VE.po +++ b/addons/google_map/i18n/es_VE.po @@ -19,13 +19,11 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Calle2 : " diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po index 8e75b221646..d6c70ce0231 100644 --- a/addons/google_map/i18n/et.po +++ b/addons/google_map/i18n/et.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kaart" @@ -29,7 +28,6 @@ msgstr "Partneri aadressid" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Tänav2: " diff --git a/addons/google_map/i18n/eu.po b/addons/google_map/i18n/eu.po index 81ab3869206..04eeb490289 100644 --- a/addons/google_map/i18n/eu.po +++ b/addons/google_map/i18n/eu.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po index c7500e3c52d..26814b3a8a7 100644 --- a/addons/google_map/i18n/fi.po +++ b/addons/google_map/i18n/fi.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kartta" @@ -30,7 +29,6 @@ msgstr "Kumppanien osoitteet" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Osoite2 " diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po index a02a14af13a..87be2ad99c4 100644 --- a/addons/google_map/i18n/fr.po +++ b/addons/google_map/i18n/fr.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Carte" @@ -30,7 +29,6 @@ msgstr "Adresses du partenaire" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Adresse suite " diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po index d36510ddc86..359bc4a2811 100644 --- a/addons/google_map/i18n/gl.po +++ b/addons/google_map/i18n/gl.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "Enderezos da Empresa" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Rúa2 : " diff --git a/addons/google_map/i18n/gu.po b/addons/google_map/i18n/gu.po index 144b5f4929b..bbf3244a01f 100644 --- a/addons/google_map/i18n/gu.po +++ b/addons/google_map/i18n/gu.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "નકશો" @@ -30,6 +29,5 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po index 5102f848e68..66af2f38363 100644 --- a/addons/google_map/i18n/hi.po +++ b/addons/google_map/i18n/hi.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "नक़्शा" @@ -30,7 +29,6 @@ msgstr "सहयोगियों के पते" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "स्ट्रीट 2 " diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po index 82914762e57..5116895e185 100644 --- a/addons/google_map/i18n/hr.po +++ b/addons/google_map/i18n/hr.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Karta" @@ -29,7 +28,6 @@ msgstr "Adrese partnera" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica 2 : " diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po index 341a0d0f096..c545c074e09 100644 --- a/addons/google_map/i18n/hu.po +++ b/addons/google_map/i18n/hu.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Térkép" @@ -30,7 +29,6 @@ msgstr "Partnerek címei" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Utca 2: " diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po index 40c4c115336..e6d1d2887a1 100644 --- a/addons/google_map/i18n/id.po +++ b/addons/google_map/i18n/id.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Peta" @@ -29,7 +28,6 @@ msgstr "Alamat partner" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Jalan " diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po index 0ff83d442b5..5ff475f1465 100644 --- a/addons/google_map/i18n/it.po +++ b/addons/google_map/i18n/it.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mappa" @@ -29,7 +28,6 @@ msgstr "Indirizzi dei Partner" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Indirizzo2 : " diff --git a/addons/google_map/i18n/ja.po b/addons/google_map/i18n/ja.po index cfa8fe1129a..60a03e45ca2 100644 --- a/addons/google_map/i18n/ja.po +++ b/addons/google_map/i18n/ja.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "地図" @@ -30,6 +29,5 @@ msgstr "パートナの住所" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "住所２： " diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po index 9a7167bac85..1336b733609 100644 --- a/addons/google_map/i18n/ko.po +++ b/addons/google_map/i18n/ko.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "맵" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "스트리트2: " diff --git a/addons/google_map/i18n/lo.po b/addons/google_map/i18n/lo.po index f7568858226..69b22ad60af 100644 --- a/addons/google_map/i18n/lo.po +++ b/addons/google_map/i18n/lo.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "ເເຜນທີ່" @@ -30,7 +29,6 @@ msgstr "ທີ່ຢູ່ຄຸຄ້າ" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "ຖນົນທີ໒ " diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po index 25ee77f673a..4a6201a974b 100644 --- a/addons/google_map/i18n/lt.po +++ b/addons/google_map/i18n/lt.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Žemėlapis" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Gatvė (2): " diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po index 2d98d19f65d..a4d3527b96f 100644 --- a/addons/google_map/i18n/lv.po +++ b/addons/google_map/i18n/lv.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Karte" @@ -30,7 +29,6 @@ msgstr "Partnera Adreses" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Iela 2: " diff --git a/addons/google_map/i18n/lv_LV.po b/addons/google_map/i18n/lv_LV.po index 424f2610648..26a13214b2f 100644 --- a/addons/google_map/i18n/lv_LV.po +++ b/addons/google_map/i18n/lv_LV.po @@ -37,12 +37,10 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "" diff --git a/addons/google_map/i18n/mk.po b/addons/google_map/i18n/mk.po index 180006e7a08..35e1bb2db8f 100644 --- a/addons/google_map/i18n/mk.po +++ b/addons/google_map/i18n/mk.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Мапа" @@ -30,7 +29,6 @@ msgstr "Адреса на партнерот" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po index a1bca95c749..653252d2067 100644 --- a/addons/google_map/i18n/mn.po +++ b/addons/google_map/i18n/mn.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Газрын зураг" @@ -30,7 +29,6 @@ msgstr "Харилцагчийн хаягууд" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Гудамж2 " diff --git a/addons/google_map/i18n/nb.po b/addons/google_map/i18n/nb.po index 978905468f8..8bdcfde514c 100644 --- a/addons/google_map/i18n/nb.po +++ b/addons/google_map/i18n/nb.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kart" @@ -30,7 +29,6 @@ msgstr "Partner adresse" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Gate2 : " diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po index 1465362edfd..ef51b3a88e8 100644 --- a/addons/google_map/i18n/nl.po +++ b/addons/google_map/i18n/nl.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Kaart" @@ -29,7 +28,6 @@ msgstr "Relatieadressen" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Adres2 : " diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po index 346aaa005dc..8360736683f 100644 --- a/addons/google_map/i18n/nl_BE.po +++ b/addons/google_map/i18n/nl_BE.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "" @@ -29,6 +28,5 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po index d30d7cf4280..d41b3e47a6d 100644 --- a/addons/google_map/i18n/oc.po +++ b/addons/google_map/i18n/oc.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Adreça seguida : " diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po index ad664a0f837..a9c5847bd81 100644 --- a/addons/google_map/i18n/pl.po +++ b/addons/google_map/i18n/pl.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "Adres partnera" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica2 : " diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po index f80ae03b9b0..5bfed12e2f9 100644 --- a/addons/google_map/i18n/pt.po +++ b/addons/google_map/i18n/pt.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "Endereços do Terceiro" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Rua2 : " diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po index 17a2e88ac46..2e164cdd940 100644 --- a/addons/google_map/i18n/pt_BR.po +++ b/addons/google_map/i18n/pt_BR.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -29,7 +28,6 @@ msgstr "Endereços do parceiro" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Rua2: " diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po index 82a5b787afb..121b675aaa5 100644 --- a/addons/google_map/i18n/ro.po +++ b/addons/google_map/i18n/ro.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Hartă" @@ -29,7 +28,6 @@ msgstr "Adresele partenerului" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Stradă2 " diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po index 37ea677500d..b68923fff31 100644 --- a/addons/google_map/i18n/ru.po +++ b/addons/google_map/i18n/ru.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Карта" @@ -29,7 +28,6 @@ msgstr "Адреса партнера" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Улица2 : " diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po index c6341f996b4..0ea35493d7f 100644 --- a/addons/google_map/i18n/sk.po +++ b/addons/google_map/i18n/sk.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Mapa" @@ -30,7 +29,6 @@ msgstr "Adresy partnera" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica2 : " diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po index c40dcb2ba9c..bdd3f9270e5 100644 --- a/addons/google_map/i18n/sl.po +++ b/addons/google_map/i18n/sl.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Zemljevid" @@ -29,7 +28,6 @@ msgstr "Naslovi stranke" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica2: " diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po index 4f24b195529..76f3f5382e8 100644 --- a/addons/google_map/i18n/sq.po +++ b/addons/google_map/i18n/sq.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Harta" @@ -30,7 +29,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Rruga2 : " diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po index cbcbcfcd944..71b18ecd951 100644 --- a/addons/google_map/i18n/sr.po +++ b/addons/google_map/i18n/sr.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "mapa" @@ -30,7 +29,6 @@ msgstr "Adresa Partnera" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica2 " diff --git a/addons/google_map/i18n/sr@latin.po b/addons/google_map/i18n/sr@latin.po index 88986dfa6e9..76c3dbdfc3b 100644 --- a/addons/google_map/i18n/sr@latin.po +++ b/addons/google_map/i18n/sr@latin.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Karta" @@ -30,7 +29,6 @@ msgstr "Partnerove adrese" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Ulica2 : " diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po index 0cf2125e246..6f9594f0d66 100644 --- a/addons/google_map/i18n/sv.po +++ b/addons/google_map/i18n/sv.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Karta" @@ -29,7 +28,6 @@ msgstr "Partner Adress" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Adress2: " diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po index 2c4ff5fac72..2a5bd7fb8b9 100644 --- a/addons/google_map/i18n/tlh.po +++ b/addons/google_map/i18n/tlh.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "" @@ -29,6 +28,5 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po index f232b32a362..6344c7caefc 100644 --- a/addons/google_map/i18n/tr.po +++ b/addons/google_map/i18n/tr.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Harita" @@ -29,7 +28,6 @@ msgstr "Bağlantılı Adresler" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Cadde2: " diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po index 5bda8feb273..ce18a1b552b 100644 --- a/addons/google_map/i18n/uk.po +++ b/addons/google_map/i18n/uk.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Карта" @@ -29,7 +28,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "Вулиця2 : " diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po index 306ca229004..617da6c74ba 100644 --- a/addons/google_map/i18n/vi.po +++ b/addons/google_map/i18n/vi.po @@ -19,7 +19,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "Bản đồ" @@ -30,7 +29,6 @@ msgstr "Địa chỉ của đối tác" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "đường 2 : " diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po index 978d2c9b6f1..d130f65fdea 100644 --- a/addons/google_map/i18n/zh_CN.po +++ b/addons/google_map/i18n/zh_CN.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "地图" @@ -29,7 +28,6 @@ msgstr "业务伙伴地址" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "街道2: " diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po index c2367ce75bc..ee4a6475477 100644 --- a/addons/google_map/i18n/zh_TW.po +++ b/addons/google_map/i18n/zh_TW.po @@ -18,7 +18,6 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Map" msgstr "" @@ -29,6 +28,5 @@ msgstr "" #. module: google_map #: view:res.partner:0 -#: view:res.partner:0 msgid "Street2 : " msgstr "" diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 7aa830cc7f1..6f6e5b394cf 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -67,7 +67,7 @@ <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/> </header> - <sheet string="Leave Request" > + <sheet string="Leave Request"> <group col="8" colspan="4"> <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/> <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index f0474c237d9..7daac86e32a 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -596,7 +596,7 @@ <h2><field name="category_id"/></h2> <group col="4"> - <field name="code" /> + <field name="code"/> <field name="sequence" /> <field name="active"/> <field name="appears_on_payslip"/> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 8fcc0d240a7..45bbb6456ef 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -41,7 +41,7 @@ <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/> </group> <group string="Accounting"> - <field domain="[('type','=','normal'),('state', '<>', 'close'),('parent_id','!=',False)]" name="account_id" /> + <field domain="[('type','=','normal'),('state', '<>', 'close'),('parent_id','!=',False)]" name="account_id"/> <field name="amount"/> <field name="general_account_id"/> <field name="journal_id"/> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index aeef0c88a03..966960b534b 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -52,7 +52,7 @@ <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> <field name="account_id" position="replace"> - <field domain="[('type','in',['normal','contract']),('state', '<>', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/> + <field domain="[('type','in',['normal','contract']),('state', '<>', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/> </field> </field> </record> @@ -76,7 +76,7 @@ <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="arch" type="xml"> <field name="account_id" position="replace"> - <field domain="[('type','in',['normal','contract']),('state', '<>', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/> + <field domain="[('type','in',['normal','contract']),('state', '<>', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/> </field> </field> </record> diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index a47bb710a22..59b4ceb67a3 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -108,9 +108,9 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Timesheet by user"> - <field name="name" /> - <field name="month" /> - <field name="user_id" /> + <field name="name"/> + <field name="month"/> + <field name="user_id"/> </form> </field> </record> @@ -188,9 +188,9 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Timesheet by invoice"> - <field name="account_id" groups="analytic.group_analytic_accounting"/> - <field name="manager_id" /> - <field name="user_id" /> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="manager_id"/> + <field name="user_id"/> </form> </field> </record> @@ -242,7 +242,7 @@ <field name="arch" type="xml"> <tree string="Daily timesheet per account"> <field name="name"/> - <field name="month" /> + <field name="month"/> <field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="user_id"/> <field name="quantity"/> @@ -267,10 +267,10 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Daily timesheet by account"> - <field name="name" /> - <field name="month" /> - <field name="account_id" groups="analytic.group_analytic_accounting"/> - <field name="user_id" /> + <field name="name"/> + <field name="month"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="user_id"/> <field name="quantity"/> </form> </field> @@ -336,10 +336,10 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Timesheet by account"> - <field name="name" /> - <field name="month" /> - <field name="account_id" groups="analytic.group_analytic_accounting"/> - <field name="user_id" /> + <field name="name"/> + <field name="month"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="user_id"/> <field name="quantity"/> </form> </field> diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index 144a9cacbc5..c7d0c6b7c25 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -8,13 +8,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Expired analytic accounts"> - <field name="name" groups="analytic.group_analytic_accounting"/> - <field name="partner_id" /> - <field name="quantity" /> - <field name="state" /> + <field name="name" groups="analytic.group_analytic_accounting"/> + <field name="partner_id"/> + <field name="quantity"/> + <field name="state"/> <field name="quantity_max"/> - <field name="date_deadline" /> - <field name="balance" /> + <field name="date_deadline"/> + <field name="balance"/> </form> </field> </record> @@ -64,11 +64,11 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Analytic Lines to Invoice"> - <field name="name" /> - <field name="month" /> - <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="name"/> + <field name="month"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> <newline/> - <field name="product_id" /> + <field name="product_id"/> <field name="product_uom_id"/> <newline/> <field colspan="1" name="amount"/> diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py index 6d53fd55c33..9a9b2802826 100644 --- a/addons/import_google/wizard/import_google.py +++ b/addons/import_google/wizard/import_google.py @@ -28,6 +28,8 @@ from pytz import timezone from datetime import datetime import time from osv import * +from tools.translate import _ + try: import gdata import gdata.contacts.service @@ -285,7 +287,7 @@ class google_import(import_framework): name = tools.ustr(entry.title.text) if name == "None": name = entry.email and entry.email[0].address or '' - data['name'] = name or 'Unknown' + data['name'] = name or _('Unknown') emails = ','.join(email.address for email in entry.email) data['email'] = emails if table == 'Contact': diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index bfde8266810..680e32fd0a5 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -1254,7 +1254,7 @@ <field ref="a222" name="parent_id"/> </record> <record id="a22280" model="account.account.template"> - <field name="name">Sur bâtiments industriels </field> + <field name="name">Sur bâtiments industriels</field> <field name="code">22280</field> <field name="type">other</field> <field name="user_type" ref="account.data_account_type_asset"/> diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml index 12f2a14b34c..0b9dab471ed 100644 --- a/addons/l10n_ch/bank_view.xml +++ b/addons/l10n_ch/bank_view.xml @@ -25,8 +25,8 @@ <field name="inherit_id" ref="base.view_res_bank_tree"/> <field name="arch" type="xml"> <field name="name" position="after"> - <field name="code" /> - <field name="clearing" /> + <field name="code"/> + <field name="clearing"/> </field> </field> </record> diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index 88ae904d7dd..68fe21ea16c 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -644,11 +644,11 @@ </record> <!-- BoMs for 1 Shelf 100cm - Product Ref. Qty UoM Type of BoM + Product Ref. Qty UoM Type of BoM SIDEPAN 2 PCE normal - PROFIL 4 PCE phantom + PROFIL 4 PCE phantom RPAN100 1 PCE phantom - RCK100 3 PCE phantom + RCK100 3 PCE phantom --> <record id="mrp_bom_sidepanel0" model="mrp.bom"> @@ -693,8 +693,8 @@ <!-- BOMs for 1 RCK100 PCE Product Ref Qty UoM Type of BoM - SPAN100 1 PCE phantom - METC000 4 PCE normal + SPAN100 1 PCE phantom + METC000 4 PCE normal --> <record id="mrp_bom_shelf1" model="mrp.bom"> <field name="sequence">133</field> @@ -723,7 +723,7 @@ <!-- Bill of Materials for 1 SPAN100 PCE Product Code Quantity Unit of Measure - WOOD010 0.083 m + WOOD010 0.083 m --> <record id="mrp_bom_span100" model="mrp.bom"> <field name="sequence">135</field> @@ -742,7 +742,7 @@ </record> <!-- BoMs for 1 Assembly Section PCE Product Ref. Qty UoM - LIN40 0.25 Meter + LIN40 0.25 Meter --> <record id="mrp_bom_assemblysection1" model="mrp.bom"> @@ -766,7 +766,7 @@ <!-- Bill of Materials for 1 RPAN100 PCE Product Code Quantity Unit of Measure - WOOD002 0.25 m + WOOD002 0.25 m --> <record id="mrp_bom_rearpanelarm1" model="mrp.bom"> <field name="sequence">131</field> @@ -797,11 +797,11 @@ <!--Defining BoMs of Shelf 200cm Product Ref. Qty UoM Type of BoM - RPAN200 1 PCE normal - PROFIL 4 PCE normal - SIDEPAN 2 PCE normal - METC000 12 PCE normal - RCK200 3 PCE normal + RPAN200 1 PCE normal + PROFIL 4 PCE normal + SIDEPAN 2 PCE normal + METC000 12 PCE normal + RCK200 3 PCE normal --> <record id="mrp_bom_rearpanelarm2" model="mrp.bom"> <field name="sequence">147</field> @@ -860,8 +860,8 @@ <!--Defining BoMs of KIT Shelf 100cm Product Ref. Qty UoM Type of BoM - PROFIL 4 PCE normal - SIDEPAN 2 PCE normal + PROFIL 4 PCE normal + SIDEPAN 2 PCE normal --> <record id="mrp_bom_assemblysection2" model="mrp.bom"> diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 50d6b5e85a9..700b9648237 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -27,7 +27,8 @@ class plugin_handler(osv.osv_memory): def partner_get(self, cr, uid, address_email): partner_obj = self.pool.get('res.partner') - res_id = partner_obj.search(cr, uid, [('email', 'like', address_email)]) or 0 + partner_ids = partner_obj.search(cr, uid, [('email', 'like', address_email)]) + res_id = partner_ids and partner_ids[0] or 0 url = self._make_url(cr, uid, res_id, 'res.partner') return ('res.partner', res_id , url) diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index e9aa3f5bf7d..3696a6125cb 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -71,9 +71,8 @@ def extract_email(user_email): class wizard(osv.osv_memory): """ - A wizard to create portal users from instances of either 'res.partner' - or 'res.partner'. The purpose is to provide an OpenERP database - access to customers or suppliers. + A wizard to create portal users from instances of 'res.partner'. The purpose + is to provide an OpenERP database access to customers or suppliers. """ _name = 'res.portal.wizard' _description = 'Portal Wizard' diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 95e515c72bf..17a745642e3 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -66,7 +66,7 @@ <field name="type">form</field> <field eval="7" name="priority"/> <field name="arch" type="xml"> - <form string="Product" version="7.0"> + <form string="Product" version="7.0"> <sheet> <field name="product_image" widget="image" class="oe_avatar oe_right" /> @@ -543,7 +543,7 @@ <field name="arch" type="xml"> <form string="Supplier Information" version="7.0"> <group col="4"> - <field name="name" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" /> + <field name="name" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/> <field name="sequence"/> <field name="product_name"/> <field name="product_code"/> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c12ed792bd5..9da977e44d7 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -38,7 +38,7 @@ <button name="set_cancel" string="Cancel" type="object" states="open,pending"/> <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/> </header> - <sheet string="Project" > + <sheet string="Project"> <field name="analytic_account_id" invisible="1" required="0"/> <label for="name" class="oe_edit_only" string="Project Name"/> <h1> @@ -50,7 +50,7 @@ </h2> <group> <group> - <field name="partner_id" on_change="onchange_partner_id(partner_id)" /> + <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/> <field name="analytic_account_id" invisible="1" required="0"/> <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> @@ -97,10 +97,10 @@ <field name="resource_calendar_id"/> </group> <group string="Miscellaneous" name="misc"> - <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/> + <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/> <field name="priority"/> <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/> - <field name="currency_id" groups="base.group_multi_company" required="1"/> + <field name="currency_id" groups="base.group_multi_company" required="1"/> </group> </group> </page> diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml index 4940e6c367c..3b019e51af6 100644 --- a/addons/project/res_partner_view.xml +++ b/addons/project/res_partner_view.xml @@ -13,7 +13,7 @@ <attribute name="invisible">False</attribute> </xpath> </field> - </record> + </record> <record id="view_task_partner_info_form" model="ir.ui.view"> <field name="name">res.partner.task.info.inherit</field> <field name="model">res.partner</field> @@ -27,8 +27,8 @@ <field name="user_id"/> <field name="date_deadline"/> <field name="state" invisible="1"/> - <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> - <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> + <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> + <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> </tree> </field> </page> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index e972ea8fe73..f867285138a 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -27,7 +27,7 @@ <field name="name">Time Estimation on Tasks</field> <field name="implied_ids" eval="[(4, ref('group_tasks_work_on_tasks'))]"/> <field name="category_id" ref="base.module_category_hidden"/> - </record> + </record> <record id="group_delegate_task" model="res.groups"> <field name="name">Task Delegation</field> diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 9b10e1019d7..2e2ec7f2677 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -36,7 +36,7 @@ <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/> <field name="arch" type="xml"> <field name="partner_id" position="replace"> - <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer" attrs="{'required':[('to_invoice','!=',False)]}"/> + <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer" attrs="{'required':[('to_invoice','!=',False)]}"/> </field> </field> </record> diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index 59dc545913f..6bc424ce60c 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -15,10 +15,10 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Timesheet/Task hours Report Per Month" > - <field name="name" /> - <field name="year" invisible="1"/> - <field name="month" invisible="1"/> - <field name="user_id" /> + <field name="name"/> + <field name="year" invisible="1"/> + <field name="month" invisible="1"/> + <field name="user_id"/> <field name="timesheet_hrs" widget="float_time" /> <field name="task_hrs" widget="float_time"/> </tree> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 8b5060a65b2..e2c4eb9e256 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -155,7 +155,7 @@ </h1> <group> <group> - <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" /> + <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"/> <field name="partner_ref"/> <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/> </group> diff --git a/addons/report_intrastat/intrastat_report.xml b/addons/report_intrastat/intrastat_report.xml index 6ab708c563e..124cf899efb 100644 --- a/addons/report_intrastat/intrastat_report.xml +++ b/addons/report_intrastat/intrastat_report.xml @@ -2,11 +2,11 @@ <openerp> <data> <report string="Invoice Intrastat" - model="account.invoice" - name="account.invoice.intrastat" - rml="report_intrastat/report/invoice.rml" - id="invoice_intrastat_id" - auto="False"/> + model="account.invoice" + name="account.invoice.intrastat" + rml="report_intrastat/report/invoice.rml" + id="invoice_intrastat_id" + auto="False"/> </data> </openerp> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 636102fa344..eae7a8e907c 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -134,8 +134,8 @@ <group> <group> <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" /> - <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" /> - <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" /> + <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/> + <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/> <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/> <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/> </group><group> diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 0b27a690e85..051fa746dd1 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -39,7 +39,7 @@ <field name="name"/> <field name="date_start"/> <field name="date_stop"/> - <field name="state" /> + <field name="state"/> </tree> </field> </record> @@ -87,10 +87,10 @@ <button name="action_validate" string="Approve" states="draft" type="object" /> <field name="state" widget="statusbar"/> </header> - <sheet string="Stock and Sales Forecast" > + <sheet string="Stock and Sales Forecast"> <group colspan = "4" col = "4" class="oe_header"> <group colspan = "2" col="2" > - <field name="company_id" + <field name="company_id" groups="base.group_multi_company" widget="selection" on_change="onchange_company(company_id)"/> @@ -246,7 +246,7 @@ <group colspan="4" col="7"> <group colspan ="3" col="2"> <separator colspan ="2" string = "General Info"/> - <field name="company_id" widget= "selection" + <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="period_id" /> diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 9c389156676..b372a9b3040 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -27,7 +27,7 @@ </header> <sheet> <group col="6" colspan="6"> - <field name="title" /> + <field name="title"/> <field name="responsible_id"/> <field name="id" invisible="1"/> <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" @@ -42,14 +42,14 @@ <page string="Survey"> <field name="page_ids" colspan="4" nolabel="1" mode="form,tree"> <form string="Survey Page"> - <field name="title" /> + <field name="title"/> <field name="sequence" groups="base.group_no_one"/> <separator string="Description" colspan="4"/> <field name="note" colspan="4" nolabel="1"/> <field name="question_ids" height="200" width="200" colspan="4" nolabel="1"> <form string="Survey Question" > <group col="6" colspan="6" height="600" width="200"> - <field name="question" colspan="4" /> + <field name="question" colspan="4"/> <field name="sequence"/> <field name="tot_resp"/> <field name="type" on_change="on_change_type(type)"/> @@ -181,7 +181,7 @@ </form> <tree string="Survey Question"> <field name="sequence" string="Seq"/> - <field name="question" colspan="4" /> + <field name="question" colspan="4"/> <field name="answer_choice_ids"/> </tree> </field> @@ -204,10 +204,10 @@ <field name="invited_user_ids" nolabel="1" readonly="1"/> </page> <page string="History"> - <field name="date_open" /> + <field name="date_open"/> <field name="date_close"/> - <field name="tot_start_survey" /> - <field name="tot_comp_survey" /> + <field name="tot_start_survey"/> + <field name="tot_comp_survey"/> <field name="history" colspan="4" nolabel="1"> <tree string="History"> <field name="date"/> @@ -231,13 +231,13 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree colors="gray:state == 'close'" string="Survey"> - <field name="title" /> - <field name="type" /> + <field name="title"/> + <field name="type"/> <field name="responsible_id"/> <field name="date_open" string="Open Date"/> <field name="tot_start_survey" string="Started"/> <field name="tot_comp_survey" string="Completed"/> - <field name="state" /> + <field name="state"/> <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}"/> @@ -304,14 +304,14 @@ <field name="arch" type="xml"> <form string="Survey Page" version="7.0"> <sheet> - <field name="title" colspan="4" /> - <field name="survey_id" /> + <field name="title" colspan="4"/> + <field name="survey_id"/> <field name="sequence"/> <separator string="Description" colspan="4"/> <field name="note" colspan="4" nolabel="1"/> <field name="question_ids" colspan="4" nolabel="1"> <form string="Survey Question"> - <field name="question" colspan="4" /> + <field name="question" colspan="4"/> <field name="sequence"/> <field name="tot_resp"/> <field name="type" on_change="on_change_type(type)"/> @@ -443,7 +443,7 @@ </form> <tree string="Survey Question"> <field name="sequence" string="Seq"/> - <field name="question" colspan="4" /> + <field name="question" colspan="4"/> <field name="answer_choice_ids"/> </tree> </field> @@ -503,7 +503,7 @@ <field name="priority">20</field> <field name="arch" type="xml"> <form string="Survey Pages"> - <field name="title" colspan="4" /> + <field name="title" colspan="4"/> <field name="sequence"/> <separator string="Description" colspan="4"/> <field name="note" colspan="4" nolabel="1"/> @@ -854,7 +854,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Survey Answer"> - <field name="answer" colspan="4" /> + <field name="answer" colspan="4"/> <field name="sequence"/> <field name="in_visible_answer_type" invisible="1"/> <group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}"> @@ -876,7 +876,7 @@ <field name="arch" type="xml"> <tree editable="bottom" string="Survey Answer"> <field name="sequence" string="Seq"/> - <field name="answer" /> + <field name="answer"/> <field name="type"/> </tree> </field> @@ -893,7 +893,7 @@ <field name="arch" type="xml"> <form string="Survey Answer"> <field name="question_id"/> - <field name="date_create" /> + <field name="date_create"/> <notebook colspan="4"> <page string="Answer"> <field name="response_answer_ids" colspan="4" nolabel="1"/> @@ -935,7 +935,7 @@ <tree string="Survey Answer Line"> <field name="page_id"/> <field name="question_id"/> - <field name="date_create" /> + <field name="date_create"/> <field name="state"/> </tree> </field> @@ -951,12 +951,12 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Survey Answer"> - <field name="survey_id" /> - <field name="date_create" /> - <field name="user_id" /> - <field name="response_type" /> + <field name="survey_id"/> + <field name="date_create"/> + <field name="user_id"/> + <field name="response_type"/> <field name="question_ids" nolabel="1" colspan="4" /> - <field name="state" /> + <field name="state"/> </form> </field> </record> @@ -967,11 +967,11 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Survey Answer"> - <field name="survey_id" /> - <field name="date_create" /> - <field name="user_id" /> - <field name="response_type" /> - <field name="state" /> + <field name="survey_id"/> + <field name="date_create"/> + <field name="user_id"/> + <field name="response_type"/> + <field name="state"/> </tree> </field> </record> @@ -1068,7 +1068,7 @@ <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/> <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/> </header> - <sheet string="Survey Request" > + <sheet string="Survey Request"> <group class="oe_header"> <field name="date_deadline"/> <field name="survey_id"/> @@ -1147,8 +1147,8 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Survey Type"> - <field name="name" /> - <field name="code" /> + <field name="name"/> + <field name="code"/> </form> </field> </record> @@ -1159,8 +1159,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Survey Type"> - <field name="name" /> - <field name="code" /> + <field name="name"/> + <field name="code"/> </tree> </field> </record> diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 62b1046d73a..840692e1f01 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -32,12 +32,12 @@ <field name="arch" type="xml"> <form string="Wiki Groups" version="7.0"> <group col="4" colspan="3" > - <field name="name" /> + <field name="name"/> <field name="create_date" readonly="2"/> </group> <group col="2" colspan="1"> - <field name="method" /> - <field name="home" domain="[('group_id','=',active_id)]" + <field name="method"/> + <field name="home" domain="[('group_id','=',active_id)]" attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" /> </group> <notebook colspan="4"> @@ -130,26 +130,26 @@ <form string="Wiki" version="7.0"> <sheet> <group col="6" colspan="4"> - <field name="name" colspan="6"/> - <field name="group_id" string="Topic" on_change="onchange_group_id(group_id, text_area)"/> + <field name="name" colspan="6"/> + <field name="group_id" string="Topic" on_change="onchange_group_id(group_id, text_area)"/> <field name="parent_id" domain="[('group_id','=',group_id)]"/> <field name="section"/> </group> <notebook colspan="4"> <page string="Content"> <separator colspan="4" string="Page Content"/> - <field name="text_area" nolabel="1" colspan="4" widget="text_wiki"/> + <field name="text_area" nolabel="1" colspan="4" widget="text_wiki"/> </page> </notebook> <group col="2" colspan="2" groups="base.group_no_one"> <separator colspan="4" string="Modification Information"/> <field name="write_date" readonly="1"/> <field name="minor_edit"/> - <field name="review" /> + <field name="review"/> </group> <group col="2" colspan="2"> <separator colspan="4" string="Meta Information"/> - <field name="tags" /> + <field name="tags"/> <field name="toc" groups="base.group_no_one"/> </group> </sheet> @@ -234,11 +234,11 @@ <field name="arch" type="xml"> <form string="Wiki History" version="7.0"> <sheet> - <field name="wiki_id" colspan="4"/> - <field name="summary" colspan="4"/> - <field name="text_area" colspan="4" nolabel="1" widget="text_wiki"/> - <field name="create_date" readonly="1"/> - <field name="minor_edit" groups="base.group_no_one"/> + <field name="wiki_id" colspan="4"/> + <field name="summary" colspan="4"/> + <field name="text_area" colspan="4" nolabel="1" widget="text_wiki"/> + <field name="create_date" readonly="1"/> + <field name="minor_edit" groups="base.group_no_one"/> </sheet> </form> </field> |