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

[FIX] fix and improve res.config views and typos

Browse Source
This commit is contained in:
Fabien Pinckaers
2015-10-08 05:42:48 -07:00
parent 72ac0a3864
commit 1a58579540
14 changed files with 124 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/res_config.py
+3 -3
View File
@@ -72,7 +72,7 @@ class AccountConfigSettings(models.TransientModel):
module_account_accountant = fields.Boolean(string='Full accounting features: journals, legal statements, chart of accounts, etc.',
help="""If you do not check this box, you will be able to do invoicing & payments,
but not accounting (Journal Items, Chart of Accounts, ...)""")
module_account_reports = fields.Boolean("Use dynamic reports for the accounting")
module_account_reports = fields.Boolean("Get dynamic accounting reports")
group_multi_currency = fields.Boolean(string='Allow multi currencies',
implied_group='base.group_multi_currency',
help="Allows you multi currency environment")
@@ -116,10 +116,10 @@ class AccountConfigSettings(models.TransientModel):
help='If you check this box, you will be able to register your payment using SEPA.\n'
'-This installs the module account_sepa.')
module_account_plaid = fields.Boolean(string="Import from Plaid.com",
module_account_plaid = fields.Boolean(string="Plaid Connector",
help='Get your bank statements from you bank and import them through plaid.com.\n'
'-that installs the module account_plaid.')
module_account_yodlee = fields.Boolean("Import from Yodlee.com",
module_account_yodlee = fields.Boolean("Bank Interface - Sync our bank feeds automatically",
help='Get your bank statements from you bank and import them through yodlee.com.\n'
'-that installs the module account_yodlee.')
module_account_bank_statement_import_qif = fields.Boolean("Import .qif files",
addons/account/views/res_config_view.xml
+48 -45
View File
@@ -18,10 +18,6 @@
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<div>
<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="fa-cogs" class="oe_inline oe_link"/>
</div>
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
@@ -42,6 +38,9 @@
<group string="Chart of Accounts" attrs="{'invisible': [('expects_chart_of_accounts','=',False)]}">
<label for="id" string="Chart of Account"/>
<div>
<div>
<button type="object" name="open_company" string="Configure your company data" class="oe_link btn-link"/>
</div>
<div>
<label for="chart_template_id" attrs="{'invisible': [('has_chart_of_accounts','!=',False)]}"/>
<field name="chart_template_id"
@@ -142,6 +141,51 @@
</div>
</div>
</group>
<separator string="Bank &amp; Cash"/>
<group name="bank_cash">
<label for="id" string="Bank Statements"/>
<div name="bank_statement_import_options">
<div>
<field name="module_account_yodlee" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_yodlee"/>
<a href="https://www.odoo.com/page/accounting-features"> View supported banks</a>
</div>
<div>
<field name="module_account_plaid" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_plaid"/>
</div>
<div>
<field name="module_account_bank_statement_import_qif" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_bank_statement_import_qif"/>
</div>
<div>
<field name="module_account_bank_statement_import_ofx" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_bank_statement_import_ofx"/>
</div>
</div>
<label for="id" string="Automate Payments"/>
<div name="bank_payments">
<div>
<field name="module_account_sepa" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_sepa"/>
</div>
<div>
<field name="module_l10n_us_check_printing" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_l10n_us_check_printing"/>
</div>
</div>
<label for="id" string="Configuration"/>
<div name="bank_options">
<div name='company_footer'>
<label for="company_footer"/>
<field name="company_footer"/>
</div>
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="transfer_account_id"/>
<field name="transfer_account_id" class="oe_inline" attrs="{'required': [('has_chart_of_accounts','!=',False)]}"/>
</div>
</div>
</group>
<separator string="Invoicing &amp; Payments"/>
<group>
<label for="id" string="Customer"/>
@@ -186,47 +230,6 @@
</div>
</div>
</group>
<separator string="Bank &amp; Cash"/>
<group name="bank_cash">
<label for="id" string="Configuration"/>
<div name="bank_options">
<div name='company_footer'>
<label for="company_footer"/>
<field name="company_footer"/>
</div>
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="transfer_account_id"/>
<field name="transfer_account_id" class="oe_inline" attrs="{'required': [('has_chart_of_accounts','!=',False)]}"/>
</div>
<div>
<field name="module_l10n_us_check_printing" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_l10n_us_check_printing"/>
</div>
<div>
<field name="module_account_sepa" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_sepa"/>
</div>
</div>
<label for="id" string="Bank Statements"/>
<div name="bank_statement_import_options">
<div>
<field name="module_account_bank_statement_import_qif" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_bank_statement_import_qif"/>
</div>
<div>
<field name="module_account_bank_statement_import_ofx" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_bank_statement_import_ofx"/>
</div>
<div>
<field name="module_account_yodlee" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_yodlee"/>
</div>
<div>
<field name="module_account_plaid" class="oe_inline" widget="upgrade_boolean"/>
<label for="module_account_plaid"/>
</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">
addons/crm/res_config.py
+1 -1
View File
@@ -22,7 +22,7 @@ class crm_configuration(osv.TransientModel):
implied_group='crm.group_use_lead'),
'module_crm_voip': fields.boolean("VoIP integration",
help="Integration with Asterisk"),
'module_website_sign': fields.boolean("Online document signature"),
'module_website_sign': fields.boolean("Odoo Sign"),
}
_defaults = {
addons/crm/res_config_view.xml
+5 -5
View File
@@ -22,15 +22,15 @@
<field name="alias_domain" class="oe_inline" readonly="1"/>
</div>
<div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
<p>
<button type="action"
name="base_setup.action_general_configuration"
string="Setup your domain alias" class="oe_link"/>
</p>
<button type="action"
name="base_setup.action_general_configuration"
string="Setup your domain alias" class="oe_link"/>
</div>
</div>
<field name="group_use_lead" widget="radio"/>
<field name="module_crm_voip" widget="upgrade_boolean"/>
</group>
<group string="Odoo Sign" name="config_sign">
<field name="module_website_sign" widget="upgrade_boolean"/>
</group>
</div>
addons/project/res_config.py
+3 -3
View File
@@ -46,7 +46,7 @@ class project_configuration(osv.osv_memory):
'group_time_work_estimation_tasks': fields.selection([
(0, "Do not estimate working time on tasks"),
(1, "Manage time estimation on tasks")
], "Time Work Estimation",
], "Time on Tasks",
implied_group='project.group_time_work_estimation_tasks',
help="Allows you to compute Time Estimation on tasks."),
'generate_project_alias': fields.selection([
@@ -54,8 +54,8 @@ class project_configuration(osv.osv_memory):
(1, "Automatically generate an email alias at the project creation")
], "Project Alias",
help="Odoo will generate an email alias at the project creation from project name."),
'module_project_timesheet_synchro': fields.boolean("Timesheet App for Chrome/Android/iOS"),
'module_project_forecast': fields.boolean("Forecasts and Planning"),
'module_project_timesheet_synchro': fields.boolean("Timesheet app for Chrome/Android/iOS"),
'module_project_forecast': fields.boolean("Forecasts, planning and Gantt charts"),
}
def onchange_time_estimation_project_timesheet(self, cr, uid, ids, group_time_work_estimation_tasks):
addons/project/res_config_view.xml
+9 -6
View File
@@ -27,21 +27,24 @@
<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"/>
<label for="id" string="Extra features"/>
<label for="id" string="Forecasts"/>
<div>
<div>
<field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
<label for="module_project_timesheet_synchro"/>
</div>
<div>
<field name="module_project_forecast" widget="upgrade_boolean"/>
<label for="module_project_forecast"/>
</div>
</div>
</group>
<group string="Timesheets">
<label for="id" string="Extra features"/>
<div>
<field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
<label for="module_project_timesheet_synchro"/>
</div>
<field name="module_project_issue_sheet" widget="radio"/>
</group>
<group string="Helpdesk &amp; Support">
<field name="module_rating_project" widget="radio"/>
<field name="module_project_issue_sheet" widget="radio"/>
</group>
</form>
</field>
addons/sale/res_config.py
+2 -2
View File
@@ -68,9 +68,9 @@ class sale_configuration(osv.TransientModel):
(0, "Allow to edit sales order from the 'Sales Order' menu (not from the Quotation menu)"),
(1, "Never allow to modify a confirmed sale order")
], "Sale Order Modification"),
'module_sale_contract': fields.boolean("Enable subscriptions and recurring revenue management"),
'module_sale_contract': fields.boolean("Manage subscriptions and recurring invoicing"),
'module_website_sale_digital': fields.boolean("Sell digital products - provide downloadable content on your customer portal"),
'module_website_portal': fields.boolean("Enable customer portal"),
'module_website_portal': fields.boolean("Enable customer portal to track orders, delivery and invoices"),
}
_defaults = {
addons/stock/res_config.py
+1 -1
View File
@@ -157,7 +157,7 @@ class stock_config_settings(osv.osv_memory):
(1, "Adapt lead times using the suppliers' open days calendars (advanced)")
], "Minimum Stock Rules",
help='This allows you to handle minimum stock rules differently by the possibility to take into account the purchase and delivery calendars \n-This installs the module stock_calendar.'),
'module_stock_barcode': fields.boolean("Barcode Support"),
'module_stock_barcode': fields.boolean("Barcode scanner support"),
'module_delivery_dhl': fields.boolean("DHL integration"),
'module_delivery_fedex': fields.boolean("Fedex integration"),
'module_delivery_ups': fields.boolean("UPS integration"),
addons/stock/res_config_view.xml
+6 -1
View File
@@ -25,12 +25,17 @@
<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"/>
<label for="id" string="Extra features"/>
<label for="id" string="Barcode Interface"/>
<div>
<div>
<field name="module_stock_barcode" widget="upgrade_boolean"/>
<label for="module_stock_barcode"/>
</div>
</div>
</group>
<group string="Shipping Connectors" name="shipping">
<label for="id" string="Carriers"/>
<div>
<div>
<field name="module_delivery_dhl" widget="upgrade_boolean"/>
<label for="module_delivery_dhl"/>
addons/web/static/src/js/views/form_widgets.js
+2 -2
View File
@@ -1655,7 +1655,7 @@ var AbstractFieldUpgrade = {
},
open_dialog: function() {
var message = _t('You need to upgrade to Odoo Enterprise to activate this feature.');
var message = _t('Upgrade to <a href="https://www.odoo.com/editions">Odoo Enterprise</a> to activate this feature.');
var buttons = [
{
text: _t("Upgrade now"),
@@ -1673,7 +1673,7 @@ var AbstractFieldUpgrade = {
size: 'medium',
buttons: buttons,
$content: $('<div>', {
text: message,
html: message,
}),
title: _t("Odoo Enterprise"),
}).open();
addons/web_settings_dashboard/static/src/js/dashboard.js
+1 -1
View File
@@ -228,7 +228,7 @@ var DashboardShare = Widget.extend({
this.data = data;
this.parent = parent;
this.share_url = 'http://www.odoo.com/';
this.share_text = encodeURIComponent("Discover #Odoo, awesome open source business apps: crm, project management, accounting, website builder, etc. https://www.odoo.com");
this.share_text = encodeURIComponent("Discover #Odoo - awesome open source business apps. https://www.odoo.com");
},
share_twitter: function(){
addons/website/models/res_config.py
+2 -2
View File
@@ -24,8 +24,8 @@ class website_config_settings(osv.osv_memory):
'cdn_activated': fields.related('website_id', 'cdn_activated', type="boolean", string='Use a Content Delivery Network (CDN)'),
'cdn_url': fields.related('website_id', 'cdn_url', type="char", string='CDN Base URL'),
'cdn_filters': fields.related('website_id', 'cdn_filters', type="text", string='CDN Filters'),
'module_website_form_editor': fields.boolean("Website form builder"),
'module_website_version': fields.boolean("Website A/B testing and versioning"),
'module_website_form_editor': fields.boolean("Form builder: create and customize forms"),
'module_website_version': fields.boolean("A/B testing and versioning"),
}
def on_change_website_id(self, cr, uid, ids, website_id, context=None):
addons/website/views/res_config.xml
+8 -5
View File
@@ -83,12 +83,12 @@
</div>
</div>
</group>
<group string="Menu">
<group string="Menu" groups="base.group_no_one">
<button type="action"
name="%(website.action_website_menu)d"
string="Configure website menus" class="oe_link"/>
</group>
<group string="Advanced">
<group string="Advanced" name="advanced">
<label for="id" string="Extra Features"/>
<div>
<div>
@@ -100,7 +100,7 @@
<label for="module_website_version"/>
</div>
</div>
<label for="id" string="Advanced options"/>
<label for="id" string="Speed"/>
<div>
<div>
<field name="compress_html"/>
@@ -109,9 +109,12 @@
<div>
<field name="cdn_activated"/>
<label for="cdn_activated"/>
</div><div>
<label for="cdn_url"/>
<field name="cdn_url" attrs="{'invisible': [('cdn_activated', '=', False)] }"/>
<label for="cdn_filters"/>
<field name="cdn_filters" attrs="{'invisible': [('cdn_activated', '=', False)] }"/>
</div>
<field name="cdn_url" attrs="{'invisible': [('cdn_activated', '=', False)] }"/>
<field name="cdn_filters" attrs="{'invisible': [('cdn_activated', '=', False)] }"/>
</div>
</group>
addons/website_sale/res_config_view.xml
+33 -9
View File
@@ -5,15 +5,39 @@
<field name="model">website.config.settings</field>
<field name="inherit_id" ref="website.view_website_config_settings"/>
<field name="arch" type="xml">
<field name="cdn_filters" position="after">
<field name="salesperson_id"/>
<field name="salesteam_id"/>
<field name="module_delivery_ups" widget="upgrade_boolean"/>
<field name="module_delivery_fedex" widget="upgrade_boolean"/>
<field name="module_delivery_ups" widget="upgrade_boolean"/>
<field name="module_delivery_usps" widget="upgrade_boolean"/>
<field name="module_sale_ebay" widget="upgrade_boolean"/>
</field>
<group name="social" position="before">
<group name="delivery" string="eCommerce">
<label for="module_delivery_ups" string="Shipping Connectors"/>
<div>
<div>
<field name="module_delivery_ups" widget="upgrade_boolean"/>
<label for="module_delivery_ups"/>
</div><div>
<field name="module_delivery_fedex" widget="upgrade_boolean"/>
<label for="module_delivery_fedex"/>
</div><div>
<field name="module_delivery_usps" widget="upgrade_boolean"/>
<label for="module_delivery_usps"/>
</div><div>
<field name="module_delivery_dhl" widget="upgrade_boolean"/>
<label for="module_delivery_dhl"/>
</div>
</div>
<label for="module_sale_ebay" string="Merchant Connectors"/>
<div>
<field name="module_sale_ebay" widget="upgrade_boolean"/>
<label for="module_sale_ebay"/>
</div>
<label string="Default Sales Team" for="salesteam_id"/>
<div>
<field name="salesteam_id" class="oe_inline"/>
</div>
<label string="Default Salesperson" for="salesperson_id"/>
<div>
<field name="salesperson_id" class="oe_inline"/>
</div>
</group>
</group>
</field>
</record>
</odoo>