pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: Configuration form views review

Browse Source 
Fix wrong template layout for settings
This commit is contained in:
qsm-odoo
2015-08-11 14:31:11 +02:00
parent 09b0ced258
commit 4304a54b02
28 changed files with 247 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/res_config_view.xml
+7 -16
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="open_account_charts_modules" model="ir.actions.act_window">
<field name="name">Chart Templates</field>
<field name="res_model">ir.module.module</field>
@@ -17,15 +16,13 @@
<form string="Configure Accounting" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<separator string="Company" groups="base.group_multi_company"/>
<group groups="base.group_multi_company">
<group string="Company" groups="base.group_multi_company">
<label for="id" string="Company"/>
<div>
<div attrs="{'invisible': [('has_default_company', '=', True)]}">
@@ -39,8 +36,7 @@
</div>
</div>
</group>
<separator string="Chart of Accounts" attrs="{'invisible': [('expects_chart_of_accounts','=',False)]}"/>
<group attrs="{'invisible': [('expects_chart_of_accounts','=',False)]}">
<group string="Chart of Accounts" attrs="{'invisible': [('expects_chart_of_accounts','=',False)]}">
<label for="id" string="Chart of Account"/>
<div>
<div>
@@ -84,11 +80,9 @@
<group string="Fiscal Year">
<label for="id" string="Financial Year End"/>
<div>
<div>
<label for="fiscalyear_last_day" string="Last Day"/>
<field name="fiscalyear_last_day" class="oe_inline"/>
<field name="fiscalyear_last_month" class="oe_inline"/>
</div>
<label for="fiscalyear_last_day" string="Last Day"/>
<field name="fiscalyear_last_day" class="oe_inline"/>
<field name="fiscalyear_last_month" class="oe_inline"/>
</div>
<label for="id" string="Lock Dates"/>
<div>
@@ -102,8 +96,7 @@
</div>
</div>
</group>
<separator string="Accounting &amp; Finance"/>
<group>
<group string="Accounting &amp; Finance">
<label for="id" string="Options"/>
<div name="account_config">
<div>
@@ -197,14 +190,13 @@
</div>
</div>
</group>
<!-- Invisible section which is inherited in other modules -->
<separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
<group name="analytic_account_sale" invisible="1">
<label for="id" string="Sale"/>
<div/>
</group>
<group name="analytic_account_purchase" invisible="1">
<label for="id" string="Purchase"/>
<div/>
</group>
</form>
</field>
@@ -220,6 +212,5 @@
<menuitem id="menu_account_config" name="Settings" parent="menu_finance_configuration"
sequence="0" action="action_account_config" groups="base.group_configuration"/>
</data>
</openerp>
addons/base_setup/res_config_view.xml
+19 -39
View File
@@ -8,15 +8,12 @@
<form string="General Settings" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="General Settings"/>
<div>
<p>
<label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
<button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
</p>
<label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
<button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
</div>
<group>
<label for="id" string="Email" name="email_label"/>
@@ -47,37 +44,29 @@
<group name="authentication">
<label for="id" string="Authentication"/>
<div>
<div>
<field name="module_auth_oauth" class="oe_inline"/>
<label for="module_auth_oauth"/>
</div>
<field name="module_auth_oauth" class="oe_inline"/>
<label for="module_auth_oauth"/>
</div>
</group>
<group>
<label for="id" string="Import / Export"/>
<div>
<div>
<field name="module_base_import" class="oe_inline"/>
<label for="module_base_import"/>
</div>
<field name="module_base_import" class="oe_inline"/>
<label for="module_base_import"/>
</div>
</group>
<group groups="base.group_no_one">
<label for="font" />
<div>
<div>
<field name="font" class="oe_inline" />
<button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
</div>
<field name="font" class="oe_inline" />
<button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
</div>
</group>
<group>
<label for="id" string="Multi Company"/>
<div>
<div name="multi_company">
<field name="module_multi_company" class="oe_inline"/>
<label for="module_multi_company"/>
</div>
<div name="multi_company">
<field name="module_multi_company" class="oe_inline"/>
<label for="module_multi_company"/>
</div>
</group>
<group attrs="{'invisible': [('module_multi_company','=',False)]}">
@@ -90,15 +79,9 @@
</div>
</group>
<group string="Shared ressources" name="company_share_ressources" attrs="{'invisible': [('module_multi_company','=',False)]}">
<label for="company_share_partner" />
<div>
<div>
<field name="company_share_partner" class="oe_inline" />
</div>
</div>
<field name="company_share_partner" class="oe_inline" />
</group>
<separator string="Google Integration" name="google"/>
<group>
<group string="Google Integration" name="google">
<label for="id" string="Google Drive"/>
<div name="google_drive">
<div name="module_google_drive">
@@ -113,12 +96,12 @@
<div name="module_google_calendar">
<field name="module_google_calendar" class="oe_inline"/>
<label for="module_google_calendar"/>
<div name="google_calendar_config_description" attrs="{'invisible': [('module_google_calendar','=',False)]}">
<p>
Once installed, you can configure your API credentials for "Google calendar"
</p>
</div>
<div name="google_calendar_config_description" attrs="{'invisible': [('module_google_calendar','=',False)]}">
<p>
Once installed, you can configure your API credentials for "Google calendar"
</p>
</div>
</div>
</div>
</group>
</form>
@@ -142,12 +125,9 @@
<form string="Configure Sales" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<div id="main">
</div>
<div id="main"/>
</form>
</field>
</record>
addons/crm/res_config_view.xml
-5
View File
@@ -6,7 +6,6 @@
<field name="model">sale.config.settings</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<data>
<div id="main" position="inside">
<group string="CRM" name="config_alias">
<label for="id" string="Leads Email Alias"/>
@@ -30,7 +29,6 @@
</p>
</div>
</div>
</group>
<group>
<label for="id" string="Manage Leads"/>
@@ -40,7 +38,6 @@
</div>
</group>
</div>
</data>
</field>
</record>
@@ -48,7 +45,5 @@
sequence="100" groups="base.group_configuration"/>
<menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
sequence="0" action="base_setup.action_sale_config"/>
</data>
</openerp>
addons/event/res_config_view.xml
+7 -33
View File
@@ -1,43 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_event_configuration" model="ir.ui.view">
<field name="name">Configure Event</field>
<field name="model">event.config.settings</field>
<field name="arch" type="xml">
<form string="Configure Event" class="oe_form_configuration">
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Events"/>
<group>
<label for="module_event_sale"/>
<div>
<field name="module_event_sale" widget="radio"/>
</div>
<label for="module_website_event_track"/>
<div>
<field name="module_website_event_track" widget="radio"/>
</div>
<label for="module_website_event_questions"/>
<div>
<field name="module_website_event_questions" widget="radio"/>
</div>
<label for="auto_confirmation"/>
<div>
<field name="auto_confirmation" widget="radio"/>
</div>
<label for="group_email_scheduling"/>
<div>
<field name="group_email_scheduling" widget="radio"/>
</div>
<group string="Events">
<field name="module_event_sale" widget="radio"/>
<field name="module_website_event_track" widget="radio"/>
<field name="module_website_event_questions" widget="radio"/>
<field name="auto_confirmation" widget="radio"/>
<field name="group_email_scheduling" widget="radio"/>
</group>
</form>
</field>
@@ -52,9 +30,5 @@
<menuitem id="menu_event_global_settings" name="Settings"
parent="menu_event_configuration" sequence="0" action="action_event_configuration"/>
</data>
</openerp>
addons/google_calendar/res_config_view.xml
+47 -60
View File
@@ -1,75 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_calendar_config_settings" model="ir.ui.view">
<field name="name">Calendar_settings_grgrgrgt</field>
<field name="model">base.config.settings</field>
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="arch" type="xml">
<div name="google_calendar" position="replace">
<div>
<div>
<label for="google_cal_sync"/>
<field name="google_cal_sync"/>
<div>
<div attrs="{'invisible':[('google_cal_sync','=',False)]}">
<br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
<ul>
<li> Connect on your google account and go to <a href='https://console.developers.google.com/' target='_blank'>https://console.developers.google.com/</a> </li>
<li>
Click on <b>'Create Project'</b> and enter a project name and change your id if you want. Don't forget to accept the Terms of Services
<br/><br/><img src='/google_calendar/static/src/img/setup_01.png' class='calendar_img_tuto'/>
</li>
<li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on <b>'Calendar API'</b>.
<br/> Activate the Calendar API by clicking on the blue button <b>'Enable API'</b>.
<br/> When it's done, the Calendar API overview will be available
<br/><br/> <img src='/google_calendar/static/src/img/setup_03.png' class='calendar_img_tuto'/>
<br/> <img src='/google_calendar/static/src/img/setup_04.png' class='calendar_img_tuto'/>
<br/> <img src='/google_calendar/static/src/img/setup_05.png' class='calendar_img_tuto'/>
</li>
<li>
In the menu on left side, select the sub menu <b>'Credentials'</b> (from menu APIs and auth) and click on button <b>'Create new Client ID'</b>
<br/><br/> <img src='/google_calendar/static/src/img/setup_06.png' class='calendar_img_tuto'/>
</li>
<li> Check that the Application type is set on <b>'Web Application'</b>, then click on <b>'Configure consent screen'</b>.
<br/> Specify an email address and a product name, then save.
<br/><br/> <img src='/google_calendar/static/src/img/setup_07.png' class='calendar_img_tuto'/>
<br/><img src='/google_calendar/static/src/img/setup_09.png' class='calendar_img_tuto'/>
<br/> You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field <b>"Authorized redirect URI"</b>
and set as value (your own domain followed by <i>'/google_account/authentication'</i>):
<br/>==> <b><field name="server_uri" readonly="1" style='display:inline'/></b>
<br/> You can now click on <b>'Create Client ID'</b>
<br/><br/> <img src='/google_calendar/static/src/img/setup_10.png' class='calendar_img_tuto'/>
</li>
<li>Once done, you will have the both informations (<b>Client ID</b> and <b>Client Secret</b>) that you need to insert in the 2 fields below!
<br/><br/> <img src='/google_calendar/static/src/img/setup_08.png' class='calendar_img_tuto'/>
</li>
<a href="#" class="oe_link">Return at Top</a>
</ul>
</div>
</div>
<div name="google_calendar">
<label for="google_cal_sync"/>
<field name="google_cal_sync"/>
<div attrs="{'invisible':[('google_cal_sync','=',False)]}">
<br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
<ul>
<li> Connect on your google account and go to <a href='https://console.developers.google.com/' target='_blank'>https://console.developers.google.com/</a> </li>
<li>
Click on <b>'Create Project'</b> and enter a project name and change your id if you want. Don't forget to accept the Terms of Services
<br/><br/><img src='/google_calendar/static/src/img/setup_01.png' class='calendar_img_tuto'/>
</li>
<li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on <b>'Calendar API'</b>.
<br/> Activate the Calendar API by clicking on the blue button <b>'Enable API'</b>.
<br/> When it's done, the Calendar API overview will be available
<br/><br/> <img src='/google_calendar/static/src/img/setup_03.png' class='calendar_img_tuto'/>
<br/> <img src='/google_calendar/static/src/img/setup_04.png' class='calendar_img_tuto'/>
<br/> <img src='/google_calendar/static/src/img/setup_05.png' class='calendar_img_tuto'/>
</li>
<li>
In the menu on left side, select the sub menu <b>'Credentials'</b> (from menu APIs and auth) and click on button <b>'Create new Client ID'</b>
<br/><br/> <img src='/google_calendar/static/src/img/setup_06.png' class='calendar_img_tuto'/>
</li>
<li> Check that the Application type is set on <b>'Web Application'</b>, then click on <b>'Configure consent screen'</b>.
<br/> Specify an email address and a product name, then save.
<br/><br/> <img src='/google_calendar/static/src/img/setup_07.png' class='calendar_img_tuto'/>
<br/><img src='/google_calendar/static/src/img/setup_09.png' class='calendar_img_tuto'/>
<br/> You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field <b>"Authorized redirect URI"</b>
and set as value (your own domain followed by <i>'/google_account/authentication'</i>):
<br/>==> <b><field name="server_uri" readonly="1" style='display:inline'/></b>
<br/> You can now click on <b>'Create Client ID'</b>
<br/><br/> <img src='/google_calendar/static/src/img/setup_10.png' class='calendar_img_tuto'/>
</li>
<li>Once done, you will have the both informations (<b>Client ID</b> and <b>Client Secret</b>) that you need to insert in the 2 fields below!
<br/><br/> <img src='/google_calendar/static/src/img/setup_08.png' class='calendar_img_tuto'/>
</li>
<a href="#" class="oe_link">Return at Top</a>
</ul>
</div>
<group>
<div class="calendar_settings">
<label for="cal_client_id" string="Google Client ID" />
<field name="cal_client_id" class="oe_inline" />
</div>
</group>
<group>
<div>
<label for="cal_client_secret" string="Google Client Secret"/>
<field name="cal_client_secret" class="oe_inline" password="True"/>
</div>
</group>
</div>
<div>
<label for="cal_client_id" string="Google Client ID"/>
<field name="cal_client_id" nolabel="1" class="oe_inline"/>
</div>
<div>
<label for="cal_client_secret" string="Google Client Secret"/>
<field name="cal_client_secret" password="True" nolabel="1" class="oe_inline"/>
</div>
</div>
</div>
</field>
</record>
<record id="action_config_settings_google_calendar" model="ir.actions.act_window">
<field name="name">API Configuration</field>
@@ -80,6 +68,5 @@
</record>
<menuitem id="menu_calendar_google_tech_config" name="API Credentials" parent="calendar.menu_calendar_configuration" groups="base.group_no_one" action="action_config_settings_google_calendar"/>
</data>
</openerp>
addons/google_drive/res_config_user_view.xml
-2
View File
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- add google drive config field in user form -->
<record model="ir.ui.view" id="view_google_drive_config_tree">
<field name="name">google_drive.config.tree</field>
<field name="model">google.drive.config</field>
addons/hr_equipment/views/res_config_views.xml
+1 -3
View File
@@ -7,11 +7,9 @@
<form string="Configure Equipments Settings" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Track Equipments"/>
<group name="hr_equipment_grp">
<group string="Track Equipments" name="hr_equipment_grp">
<label for="id" string="Requests Alias"/>
<div>
<label for="equipment_alias_prefix" class="oe_inline"/>
addons/hr_payroll/res_config_view.xml
+1 -4
View File
@@ -16,11 +16,9 @@
<form string="Configure Payroll" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Payroll"/>
<group>
<group string="Payroll">
<label for="id" string="Settings"/>
<div>
<field name="module_hr_payroll_account" class="oe_inline"/>
@@ -45,6 +43,5 @@
<menuitem id="menu_hr_payroll_global_settings" name="Settings"
parent="menu_hr_payroll_configuration" sequence="0" action="action_hr_payroll_configuration"/>
</data>
</openerp>
addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
+5 -13
View File
@@ -15,22 +15,15 @@
<form string="Configure HR Recruitment" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Recruitment"/>
<group>
<label for="module_document"/>
<div>
<field name="module_document" widget="radio"/>
</div>
</group>
<group>
<group string="Recruitment">
<field name="module_document" widget="radio"/>
<label string="Default job email address" for="alias_prefix" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
<label string="Default job email address"/>
<field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>
@<field name="alias_domain" class="oe_inline" readonly="1"/>
</div>
</group>
</form>
@@ -46,6 +39,5 @@
<menuitem id="menu_hr_recruitment_global_settings" name="Settings"
parent="menu_hr_recruitment_configuration" sequence="0" action="action_hr_recruitment_configuration"/>
</data>
</openerp>
addons/marketing/res_config_view.xml
+2 -5
View File
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_marketing_configuration" model="ir.ui.view">
<field name="name">Configure Marketing</field>
<field name="model">marketing.config.settings</field>
<field name="arch" type="xml">
<form string="Configure Marketing" class="oe_form_configuration">
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<div name="config_setting"></div>
<div name="config_setting"/>
</form>
</field>
</record>
@@ -23,6 +21,5 @@
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
</data>
</openerp>
addons/mass_mailing/views/res_config.xml
+2 -9
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_mass_mailing_configuration" model="ir.ui.view">
<field name="name">Configure Mass Mailing</field>
<field name="model">mass.mailing.config.settings</field>
@@ -9,15 +8,10 @@
<form string="Configure Mass Mailing" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Mass Mailing"/>
<group>
<label for="group_mass_mailing_campaign"/>
<div>
<field name="group_mass_mailing_campaign" widget="radio"/>
</div>
<group string="Mass Mailing">
<field name="group_mass_mailing_campaign" widget="radio"/>
</group>
</form>
</field>
@@ -34,6 +28,5 @@
sequence="100" groups="base.group_configuration"/>
<menuitem id="menu_mass_mailing_global_settings" name="Settings"
parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration"/>
</data>
</openerp>
addons/mrp/res_config_view.xml
+8 -34
View File
@@ -20,42 +20,17 @@
<form string="Configure Manufacturing" class= "oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Manufacturing Order"/>
<group>
<label for="group_product_variant"/>
<div>
<field name="group_product_variant" widget="radio"/>
</div>
<label for="module_mrp_byproduct"/>
<div>
<field name="module_mrp_byproduct" widget="radio"/>
</div>
<label for="module_mrp_repair"/>
<div>
<field name="module_mrp_repair" widget="radio"/>
</div>
<label for="group_mrp_routings"/>
<div>
<field name="group_mrp_routings" widget="radio"/>
</div>
<label for="module_mrp_operations"/>
<div>
<field name="module_mrp_operations" widget="radio"/>
</div>
<group string="Manufacturing Order">
<field name="group_product_variant" widget="radio"/>
<field name="module_mrp_byproduct" widget="radio"/>
<field name="module_mrp_repair" widget="radio"/>
<field name="group_mrp_routings" widget="radio"/>
<field name="module_mrp_operations" widget="radio"/>
</group>
<separator string="Master Data"/>
<group >
<label for="group_rounding_efficiency"/>
<div>
<field name="group_rounding_efficiency" widget="radio"/>
</div>
<group string="Master Data">
<field name="group_rounding_efficiency" widget="radio"/>
</group>
</form>
</field>
@@ -70,6 +45,5 @@
<menuitem id="base.menu_mrp_config" name="Settings" parent="menu_mrp_configuration"
sequence="0" action="action_mrp_configuration" groups="base.group_configuration"/>
</data>
</openerp>
addons/payment/views/res_config_view.xml
-2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Add payment options to sale.order and invoice forms -->
<record model="ir.ui.view" id="payment_acquirer_installation">
<field name="model">account.config.settings</field>
@@ -35,6 +34,5 @@
</xpath>
</field>
</record>
</data>
</openerp>
addons/payment_paypal/views/res_config_view.xml
-2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Add payment options to sale.order and invoice forms -->
<record model="ir.ui.view" id="payment_paypal_option_config">
<field name="model">account.config.settings</field>
@@ -12,6 +11,5 @@
</xpath>
</field>
</record>
</data>
</openerp>
addons/point_of_sale/res_config_view.xml
+5 -18
View File
@@ -5,28 +5,15 @@
<field name="name">pos.config.settings.form</field>
<field name="model">pos.config.settings</field>
<field name="arch" type="xml">
<form string="Configure Point of Sale" class="oe_form_configuration">
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Point of Sale"/>
<group>
<label for="module_pos_restaurant"/>
<div>
<field name="module_pos_restaurant" widget="radio"/>
</div>
<label for="module_pos_loyalty"/>
<div>
<field name="module_pos_loyalty" widget="radio"/>
</div>
<label for="module_pos_discount"/>
<div>
<field name="module_pos_discount" widget="radio"/>
</div>
<group string="Point of Sale">
<field name="module_pos_restaurant" widget="radio"/>
<field name="module_pos_loyalty" widget="radio"/>
<field name="module_pos_discount" widget="radio"/>
</group>
</form>
</field>
addons/portal_sale/res_config_view.xml
-2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Add payment options to sale.order and invoice forms -->
<record model="ir.ui.view" id="portal_sale_payment_option_config">
<field name="model">account.config.settings</field>
@@ -24,6 +23,5 @@
</xpath>
</field>
</record>
</data>
</openerp>
addons/product/res_config_view.xml
+1 -8
View File
@@ -1,22 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="inherit_view_general_configuration" model="ir.ui.view">
<field name="name">General Settings</field>
<field name="model">base.config.settings</field>
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='company_share_ressources']" position="inside">
<label for="company_share_product" />
<div>
<div>
<field name="company_share_product" class="oe_inline" />
</div>
</div>
<field name="company_share_product" class="oe_inline"/>
</xpath>
</field>
</record>
</data>
</openerp>
addons/project/res_config_view.xml
+8 -30
View File
@@ -18,40 +18,19 @@
<field name="model">project.config.settings</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Configure Project" class="oe_form_configuration">
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Project Management"/>
<group name="project_management">
<label for="module_sale_service"/>
<div>
<field name="module_sale_service" widget="radio"/>
</div>
<label for="module_pad"/>
<div>
<field name="module_pad" widget="radio"/>
</div>
<label for="group_time_work_estimation_tasks"/>
<div>
<field name="group_time_work_estimation_tasks" on_change="onchange_time_estimation_project_timesheet(group_time_work_estimation_tasks)" widget="radio"/>
</div>
<group string="Project Management" name="project_management">
<field name="module_sale_service" widget="radio"/>
<field name="module_pad" widget="radio"/>
<field name="group_time_work_estimation_tasks" on_change="onchange_time_estimation_project_timesheet(group_time_work_estimation_tasks)" widget="radio"/>
</group>
<separator string="Helpdesk &amp; Support"/>
<group>
<label for="module_rating_project"/>
<div>
<field name="module_rating_project" widget="radio"/>
</div>
<label for="module_project_issue_sheet"/>
<div>
<field name="module_project_issue_sheet" widget="radio"/>
</div>
<group string="Helpdesk &amp; Support">
<field name="module_rating_project" widget="radio"/>
<field name="module_project_issue_sheet" widget="radio"/>
</group>
</form>
</field>
@@ -67,6 +46,5 @@
<menuitem id="base.menu_project_general_settings" name="Settings" parent="menu_project_config"
sequence="0" action="action_config_settings"/>
</data>
</openerp>
addons/project_timesheet/res_config_view.xml
+1 -4
View File
@@ -7,10 +7,7 @@
<field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='project_management']" position="inside">
<label for="group_tasks_work_on_tasks"/>
<div>
<field name="group_tasks_work_on_tasks" widget="radio"/>
</div>
<field name="group_tasks_work_on_tasks" widget="radio"/>
</xpath>
</field>
</record>
addons/purchase/res_config_view.xml
+12 -43
View File
@@ -20,54 +20,24 @@
<form string="Configure Purchases" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Invoicing Process"/>
<group>
<group string="Invoicing Process">
<label for="id" string="Default Invoicing Settings"/>
<div>
<field name="default_invoice_method" widget="radio" class="oe_inline"/>
<field name="default_invoice_method" widget="radio"/>
</div>
</group>
<separator string="Purchase Order"/>
<group>
<label for="group_product_variant"/>
<div>
<field name="group_product_variant" widget="radio"/>
</div>
<label for="group_purchase_pricelist"/>
<div>
<field name="group_purchase_pricelist" widget="radio"/>
</div>
<label for="group_uom"/>
<div>
<field name="group_uom" widget="radio"/>
</div>
<label for="group_costing_method"/>
<div>
<field name="group_costing_method" widget="radio"/>
</div>
<label for="module_purchase_double_validation"/>
<div name="module_purchase_double_validation">
<field name="module_purchase_double_validation" widget="radio"/>
</div>
<label for="module_purchase_requisition"/>
<div>
<field name="module_purchase_requisition" widget="radio"/>
</div>
<group string="Purchase Order">
<field name="group_product_variant" widget="radio"/>
<field name="group_purchase_pricelist" widget="radio"/>
<field name="group_uom" widget="radio"/>
<field name="group_costing_method" widget="radio"/>
<field name="module_purchase_double_validation" widget="radio"/>
<field name="module_purchase_requisition" widget="radio"/>
</group>
<separator string="Location &amp; Warehouse"/>
<group>
<label for="module_stock_dropshipping"/>
<div>
<field name="module_stock_dropshipping" widget="radio"/>
</div>
<group string="Location &amp; Warehouse">
<field name="module_stock_dropshipping" widget="radio"/>
</group>
</form>
</field>
@@ -96,7 +66,7 @@
<group name="analytic_account_purchase" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<xpath expr="//group[@name='analytic_account_purchase']/div" position="inside">
<xpath expr="//group[@name='analytic_account_purchase']" position="inside">
<div>
<field name="group_analytic_account_for_purchases" class="oe_inline"/>
<label for="group_analytic_account_for_purchases"/>
@@ -104,6 +74,5 @@
</xpath>
</field>
</record>
</data>
</openerp>
addons/purchase_double_validation/purchase_double_validation_installer.xml
+7 -7
View File
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<record id="view_double_purchase_configuration" model="ir.ui.view">
<field name="name">Purchase Application</field>
<field name="model">purchase.config.settings</field>
<field name="inherit_id" ref="purchase.view_purchase_configuration"/>
<field name="arch" type="xml">
<div name="module_purchase_double_validation" position="inside">
<span class="oe_separate-from-text">
<field name="module_purchase_double_validation" position="replace">
<label for="module_purchase_double_validation"/>
<div>
<field name="module_purchase_double_validation" widget="radio"/>
<label for="limit_amount"/>
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',1)]}" class="oe_inline"/>
</span>
</div>
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=', 1)]}" class="oe_inline"/>
</div>
</field>
</field>
</record>
</data>
</openerp>
addons/sale/res_config_view.xml
+11 -48
View File
@@ -8,57 +8,20 @@
<field name="arch" type="xml">
<div id="main" position="inside">
<group string="Products">
<label for="group_product_variant"/>
<div>
<field name="group_product_variant" widget="radio"/>
</div>
<label for="module_website_sale_digital"/>
<div>
<field name="module_website_sale_digital" widget="radio"/>
</div>
<label for="group_uom" string="Unit of Measures"/>
<div>
<field name="group_uom" widget="radio"/>
</div>
<field name="group_product_variant" widget="radio"/>
<field name="module_website_sale_digital" widget="radio"/>
<field name="group_uom" widget="radio"/>
</group>
<group string="Quotations &amp; Sales" id="sale">
<label for="group_sale_pricelist"/>
<div>
<field name="group_sale_pricelist" widget="radio"/>
</div>
<label for="group_sale_delivery_address"/>
<div>
<field name="group_sale_delivery_address" widget="radio"/>
</div>
<label for="group_display_incoterm"/>
<div>
<field name="group_display_incoterm" widget="radio"/>
</div>
<label for="group_discount_per_so_line"/>
<div>
<field name="group_discount_per_so_line" widget="radio"/>
</div>
<label for="module_website_quote"/>
<div>
<field name="module_website_quote" widget="radio"/>
</div>
<label for="module_sale_margin"/>
<div>
<field name="module_sale_margin" widget="radio"/>
</div>
<field name="group_sale_pricelist" widget="radio"/>
<field name="group_sale_delivery_address" widget="radio"/>
<field name="group_display_incoterm" widget="radio"/>
<field name="group_discount_per_so_line" widget="radio"/>
<field name="module_website_quote" widget="radio"/>
<field name="module_sale_margin" widget="radio"/>
</group>
<group string="Contracts" id="contract">
<label for="module_sale_contract"/>
<div>
<field name="module_sale_contract" widget="radio"/>
</div>
<field name="module_sale_contract" widget="radio"/>
</group>
</div>
</field>
@@ -81,7 +44,7 @@
<group name="analytic_account_sale" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<xpath expr="//group[@name='analytic_account_sale']/div" position="inside">
<xpath expr="//group[@name='analytic_account_sale']" position="inside">
<div>
<field name="group_analytic_account_for_sales" class="oe_inline"/>
<label for="group_analytic_account_for_sales"/>
addons/sale_contract/views/res_config_view.xml
+1 -6
View File
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_sales_config" model="ir.ui.view">
<field name="name">sale settings</field>
<field name="model">sale.config.settings</field>
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="arch" type="xml">
<xpath expr="//group[@id='contract']" position="inside">
<label for="group_template_required"/>
<div>
<field name="group_template_required" widget="radio"/>
</div>
<field name="group_template_required" widget="radio"/>
</xpath>
</field>
</record>
</data>
</openerp>
addons/sale_stock/res_config_view.xml
+20 -42
View File
@@ -1,43 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_sales_config_sale_stock" model="ir.ui.view">
<field name="name">sale settings</field>
<field name="model">sale.config.settings</field>
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="arch" type="xml">
<data>
<xpath expr="//div[@id='main']" position="inside">
<group string="Shipping">
<label for="module_delivery"/>
<div>
<field name="module_delivery" widget="radio"/>
</div>
<label for="default_picking_policy"/>
<div name='default_picking_policy'>
<field name="default_picking_policy" widget="radio"/>
</div>
</group>
</xpath>
<xpath expr="//group[@id='sale']" position="inside">
<label for="default_order_policy"/>
<div>
<field name="default_order_policy" widget="radio"/>
</div>
<label for="group_route_so_lines"/>
<div>
<field name="group_route_so_lines" widget="radio"/>
</div>
<label for="group_mrp_properties" groups="base.group_no_one"/>
<div groups="base.group_no_one">
<field name="group_mrp_properties" widget="radio"/>
</div>
</xpath>
</data>
</field>
</record>
</data>
</openerp>
<odoo>
<record id="view_sales_config_sale_stock" model="ir.ui.view">
<field name="name">sale settings</field>
<field name="model">sale.config.settings</field>
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='main']" position="inside">
<group string="Shipping">
<field name="module_delivery" widget="radio"/>
<field name="default_picking_policy" widget="radio"/>
</group>
</xpath>
<xpath expr="//group[@id='sale']" position="inside">
<field name="default_order_policy" widget="radio"/>
<field name="group_route_so_lines" widget="radio"/>
<field name="group_mrp_properties" widget="radio" groups="base.group_no_one"/>
</xpath>
</field>
</record>
</odoo>
addons/sales_team/__init__.py
-1
View File
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import sales_team
addons/stock/res_config_view.xml
+22 -79
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- After installation of the module, open the related menu -->
<record id="action_client_warehouse_menu" model="ir.actions.client">
<field name="name">Open Warehouse Menu</field>
@@ -19,98 +18,42 @@
<form string="Configure Warehouse" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Traceability"/>
<group name="traceability">
<label for="group_stock_production_lot"/>
<div>
<field name="group_stock_production_lot" widget="radio"/>
</div>
<label for="module_product_expiry" attrs="{'invisible': [('group_stock_production_lot','=',0)]}"/>
<div attrs="{'invisible': [('group_stock_production_lot','=', 0)]}">
<field name="module_product_expiry" widget="radio"/>
</div>
<label for="group_stock_tracking_lot"/>
<div>
<field name="group_stock_tracking_lot" widget="radio"/>
</div>
<label for="group_stock_tracking_owner"/>
<div>
<field name="group_stock_tracking_owner" widget="radio"/>
</div>
<group string="Traceability" name="traceability">
<field name="group_stock_production_lot" widget="radio"/>
<field name="module_product_expiry" widget="radio" attrs="{'invisible': [('group_stock_production_lot','=', 0)]}"/>
<field name="group_stock_tracking_lot" widget="radio"/>
<field name="group_stock_tracking_owner" widget="radio"/>
</group>
<separator string="Location &amp; Warehouse"/>
<group>
<label for="group_product_variant"/>
<div>
<field name="group_product_variant" widget="radio"/>
</div>
<label for="module_procurement_jit"/>
<div>
<field name="module_procurement_jit" widget="radio"/>
</div>
<label for="group_stock_multiple_locations"/>
<div>
<field name="group_stock_multiple_locations" widget="radio"/>
</div>
<group string="Location &amp; Warehouse">
<field name="group_product_variant" widget="radio"/>
<field name="module_procurement_jit" widget="radio"/>
<field name="group_stock_multiple_locations" widget="radio"/>
<label for="group_stock_adv_location"/>
<div>
<field name="group_stock_adv_location" widget="radio"/>
<label for="propagation_minimum_delta" attrs="{'invisible': [('group_stock_adv_location', '=', 0)]}"/>
<field name="propagation_minimum_delta" class="oe_inline" attrs="{'invisible': [('group_stock_adv_location', '=', 0)]}"/>
<div attrs="{'invisible': [('group_stock_adv_location', '=', 0)]}">
<label for="propagation_minimum_delta"/>
<field name="propagation_minimum_delta" class="oe_inline"/>
</div>
</div>
</group>
<group>
<label for="id" string="Products" groups="base.group_no_one"/>
<div groups="base.group_no_one">
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
<label for="group_stock_packaging"/>
<div>
<field name="group_stock_packaging" widget="radio"/>
</div>
<label for="group_uom"/>
<div>
<field name="group_uom" widget="radio"/>
</div>
<label for="group_uos"/>
<div>
<field name="group_uos" widget="radio"/>
</div>
<label for="module_claim_from_delivery"/>
<div>
<field name="module_claim_from_delivery" widget="radio"/>
</div>
<label for="module_stock_dropshipping"/>
<div>
<field name="module_stock_dropshipping" widget="radio"/>
</div>
<label for="module_stock_picking_wave"/>
<div>
<field name="module_stock_picking_wave" widget="radio"/>
</div>
<label for="module_stock_calendar"/>
<div>
<field name="module_stock_calendar" widget="radio"/>
</div>
<field name="group_stock_packaging" widget="radio"/>
<field name="group_uom" widget="radio"/>
<field name="group_uos" widget="radio"/>
<field name="module_claim_from_delivery" widget="radio"/>
<field name="module_stock_dropshipping" widget="radio"/>
<field name="module_stock_picking_wave" widget="radio"/>
<field name="module_stock_calendar" widget="radio"/>
</group>
</form>
</field>
addons/stock_account/res_config_view.xml
+5 -16
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_stock_config_settings_inherit" model="ir.ui.view">
@@ -6,22 +7,10 @@
<field name="inherit_id" ref="stock.view_stock_config_settings"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='traceability']" position="after">
<separator string="Accounting"/>
<group>
<label for="module_stock_landed_costs"/>
<div>
<field name="module_stock_landed_costs" widget="radio" on_change="onchange_landed_costs(module_stock_landed_costs)"/>
</div>
<label for="group_stock_inventory_valuation"/>
<div>
<field name="group_stock_inventory_valuation" widget="radio"/>
</div>
<label for="module_stock_invoice_directly"/>
<div>
<field name="module_stock_invoice_directly" widget="radio"/>
</div>
<group string="Accounting">
<field name="module_stock_landed_costs" widget="radio" on_change="onchange_landed_costs(module_stock_landed_costs)"/>
<field name="group_stock_inventory_valuation" widget="radio"/>
<field name="module_stock_invoice_directly" widget="radio"/>
</group>
</xpath>
</field>
addons/website_version/views/res_config.xml
+55 -71
View File
@@ -22,78 +22,62 @@
<group>
<label for="id" string="Google Analytics"/>
<div>
<div>
<label for="ga_sync"/>
<field name="ga_sync" class="oe_inline"/>
<div>
<div attrs="{'invisible':[('ga_sync','=',False)]}">
<br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
<ul>
<li> Connect on your google account and go to <a href='https://console.developers.google.com' target='_blank'>https://console.developers.google.com</a> </li>
<li>
Click on <b>"Create Project"</b> and enter a project name.
<br/><br/><img src='/website_version/static/src/img/GC/GC_create_project.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_new_project.png'
class='analytics_img_tuto'/>
</li>
<li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate <b>"Analytics API"</b> by clicking on button "OFF".
<br/> When it's done, check that the button of <b>"Calendar API"</b> is well in green and with text "ON"
<br/><br/><img src='/website_version/static/src/img/GC/GC_API.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_off_api.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_on_api.png'
class='analytics_img_tuto'/>
</li>
<li>
In the menu on left side, select the sub menu <b>'Credentials'</b> (from menu APIs and auth) and click on button <b>'Create New Client ID'</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_credentials.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_create_new_client_id.png'
class='analytics_img_tuto'/>
</li>
<li> Fill in the Name of application and check that the platform is well on <b>'Web Application'</b>.<br/>
<br/> You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field <b>"Redirect RI"</b>
and set as value (your own domain followed by <i>"/google_account/authentication"</i>) :
<br/> You can now click on <b>'Create Client ID'</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_client_id.png'
class='analytics_img_tuto'/>
</li>
<li>Once done, you will have the both informations (<b>Client ID</b> and <b>Client Secret</b>) that you need to insert in the 2 fields below !
<br/><br/><img src='/website_version/static/src/img/GC/GC_copy.png'
class='analytics_img_tuto'/>
</li>
<li>Click on <b>Apply</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_Apply.png'
class='analytics_img_tuto'/>
</li>
<a href="#" class="oe_link">Return at Top</a>
</ul>
</div>
</div>
<label for="ga_sync"/>
<field name="ga_sync"/>
<div attrs="{'invisible':[('ga_sync','=',False)]}">
<br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
<ul>
<li> Connect on your google account and go to <a href='https://console.developers.google.com' target='_blank'>https://console.developers.google.com</a> </li>
<li>
Click on <b>"Create Project"</b> and enter a project name.
<br/><br/><img src='/website_version/static/src/img/GC/GC_create_project.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_new_project.png'
class='analytics_img_tuto'/>
</li>
<li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate <b>"Analytics API"</b> by clicking on button "OFF".
<br/> When it's done, check that the button of <b>"Calendar API"</b> is well in green and with text "ON"
<br/><br/><img src='/website_version/static/src/img/GC/GC_API.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_off_api.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_on_api.png'
class='analytics_img_tuto'/>
</li>
<li>
In the menu on left side, select the sub menu <b>'Credentials'</b> (from menu APIs and auth) and click on button <b>'Create New Client ID'</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_credentials.png'
class='analytics_img_tuto'/>
<br/><br/><img src='/website_version/static/src/img/GC/GC_create_new_client_id.png'
class='analytics_img_tuto'/>
</li>
<li> Fill in the Name of application and check that the platform is well on <b>'Web Application'</b>.<br/>
<br/> You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field <b>"Redirect RI"</b>
and set as value (your own domain followed by <i>"/google_account/authentication"</i>) :
<br/> You can now click on <b>'Create Client ID'</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_client_id.png'
class='analytics_img_tuto'/>
</li>
<li>Once done, you will have the both informations (<b>Client ID</b> and <b>Client Secret</b>) that you need to insert in the 2 fields below !
<br/><br/><img src='/website_version/static/src/img/GC/GC_copy.png'
class='analytics_img_tuto'/>
</li>
<li>Click on <b>Apply</b>
<br/><br/><img src='/website_version/static/src/img/GC/GC_Apply.png'
class='analytics_img_tuto'/>
</li>
<a href="#" class="oe_link">Return at Top</a>
</ul>
</div>
<group>
<div class="analytics_settings">
<group>
<div>
<label for="ga_client_id" string="Google Client ID" />
<field name="ga_client_id" class="oe_inline"/>
</div>
</group>
<group>
<div>
<label for="ga_client_secret" string="Google Client Secret"/>
<field name="ga_client_secret" class="oe_inline"/>
</div>
</group>
<group>
<div>
<field name="google_management_authorization" widget="rtoken"/>
</div>
</group>
</div>
</group>
<div>
<label for="ga_client_id" string="Google Client ID" />
<field name="ga_client_id" class="oe_inline"/>
</div>
<div>
<label for="ga_client_secret" string="Google Client Secret"/>
<field name="ga_client_secret" class="oe_inline"/>
</div>
<field name="google_management_authorization" widget="rtoken"/>
</div>
</group>
</group>