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

[MERGE] merge with parent branch

Browse Source 
bzr revid: fka@tinyerp.com-20120724091040-trgg97x60ntb5mob
This commit is contained in:
Foram Katharotiya (OpenERP)
2012-07-24 14:40:40 +05:30
parent 61f361bfee b4d2017a33
commit 2c44d2a405
19 changed files with 850 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/res_config_view.xml
+205 -81
View File
@@ -25,96 +25,220 @@
<field name="has_chart_of_accounts" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<field name="has_fiscal_year" invisible="1"/>
<separator string="Chart of Accounts" groups="base.group_multi_company"/>
<group groups="base.group_multi_company">
<field name="company_id" string="Select Company" widget="selection"
on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/>
</group>
<group string="Select a Chart of Accounts to Install"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<group>
<field name="chart_template_id" widget="selection" domain="[('visible','=', True)]"
on_change="onchange_chart_template_id(chart_template_id)"/>
<field name="code_digits" groups="account.group_account_user"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
</group>
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
</group>
<group string="No Fiscal Year Defined for This Company"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<label for="date_start" string="Date Range"/>
<label for="id" string="Chart of Accounts"/>
<div>
<field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
<field name="date_stop" class="oe_inline"/>
<div attrs="{'invisible': [('has_default_company', '=', True)]}">
<label for="company_id" string="Select Company"/>
<field name="company_id"
widget="selection"
on_change="onchange_company_id(company_id)"
class="oe_inline"/>
</div>
<div>
<field name="expects_chart_of_accounts" class="oe_inline"/>
<label for="expects_chart_of_accounts"/>
</div>
</div>
<field name="period"/>
</group>
<group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label for="id" string="Select Chart"/>
<div>
<div>
<field name="chart_template_id"
widget="selection"
domain="[('visible','=', True)]"
on_change="onchange_chart_template_id(chart_template_id)"
class="oe_inline"/>
<button string="Install More Chart Templates"
icon="gtk-go-forward"
name="%(open_account_charts_modules)d"
type="action"
class="oe_link"/>
</div>
<div groups="account.group_account_user">
<label for="code_digits"/>
<field name="code_digits" class="oe_inline"/>
</div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}">
<label for="sale_tax"/>
<field name="sale_tax"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"
class="oe_inline"/>
</div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}">
<label for="purchase_tax"/>
<field name="purchase_tax"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"
class="oe_inline"/>
</div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
<label for="sale_tax_rate"/>
<field name="sale_tax_rate" on_change="onchange_tax_rate(sale_tax_rate)"/>
</div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
<label for="purchase_tax_rate"/>
<field name="purchase_tax_rate" />
</div>
</div>
</group>
<separator string="No Fiscal Year Defined for This Company" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}"/>
<group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<label for="id" string="Fiscal Year"/>
<div>
<div>
<label for="date_start" string="Date Range"/>
<field name="date_start"
on_change="onchange_start_date(date_start)"
class="oe_inline"/> -
<field name="date_stop" class="oe_inline"/>
</div>
<div>
<label for="period"/>
<field name="period" class="oe_inline"/>
</div>
</div>
</group>
<separator string="Accounting Configuration"/>
<group>
<group name="account_config">
<separator string="Accounting Configuration" colspan="2"/>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="module_account_accountant"/>
<field name="currency_id"/>
<field name="decimal_precision"/>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="tax_calculation_rounding_method"/>
<field name="module_account_asset"/>
<field name="module_account_budget"/>
<separator string="Customer Invoices" colspan="2"/>
<label for="sale_sequence_next"/>
<group>
<field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
<label for="id" string="Configuration"/>
<div name="account_config">
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="default_sale_tax"/>
<field name="default_sale_tax"
domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
class="oe_inline"/>
</div>
<div>
<field name="module_account_accountant" class="oe_inline"/>
<label for="module_account_accountant"/>
</div>
<div>
<label for="currency_id"/>
<field name="currency_id" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="default_purchase_tax"/>
<field name="default_purchase_tax"
domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
class="oe_inline"/>
</div>
<div>
<label for="tax_calculation_rounding_method"/>
<field name="tax_calculation_rounding_method" class="oe_inline"/>
</div>
<div>
<field name="module_account_asset" class="oe_inline"/>
<label for="module_account_asset"/>
</div>
<div>
<field name="module_account_budget" class="oe_inline"/>
<label for="module_account_budget"/>
</div>
</div>
</group>
<separator string="Invoices"/>
<group>
<label for="id" string="Customer Settings"/>
<div>
<div>
<label for="sale_sequence_next"/>
<field name="sale_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group>
<label for="sale_refund_sequence_next"/>
<group>
<field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
<field name="sale_sequence_next"
class="oe_inline"
attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</div>
<div>
<label for="sale_refund_sequence_next"/>
<field name="sale_refund_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
<separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
<group name="other_cofing">
<separator string="Supplier Invoices" colspan="2"/>
<label for="purchase_sequence_next"/>
<group>
<field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
<field name="sale_refund_sequence_next"
class="oe_inline"
attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</div>
<div>
<field name="module_account_voucher" class="oe_inline"/>
<label for="module_account_voucher"/>
</div>
<div>
<field name="module_account_followup" class="oe_inline"/>
<label for="module_account_followup"/>
</div>
<div>
<field name="group_proforma_invoices" class="oe_inline"/>
<label for="group_proforma_invoices"/>
</div>
</div>
<label for="id" string="Supplier Settings"/>
<div name="other_cofing">
<div>
<label for="purchase_sequence_next"/>
<field name="purchase_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</group>
<label for="purchase_refund_sequence_next"/>
<group>
<field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
<field name="purchase_sequence_next"
class="oe_inline"
attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</div>
<div>
<label for="purchase_refund_sequence_next"/>
<field name="purchase_refund_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_refund_sequence_next" class="oe_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
</group>
<field name="module_account_payment"/>
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
<separator string="Bank &amp; Cash" colspan="2"/>
<label for="id" string="Configure Bank Accounts"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<field name="purchase_refund_sequence_next"
class="oe_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</div>
<div>
<field name="module_account_payment" class="oe_inline"/>
<label for="module_account_payment"/>
</div>
</div>
</group>
<separator string="Electronic Payments"/>
<group>
<label for="id" string="Payment Settings"/>
<div>
<div>
<label for="paypal_account"/>
<field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>
<separator string="Bank &amp; Cash"/>
<group>
<label for="id" string="Configuration"/>
<div>
<div>
<label string="Configure Bank Accounts"/>
<button name="%(action_bank_tree)d"
string="Configure"
icon="gtk-go-forward"
type="action"
class="oe_inline oe_link"/>
</div>
<div>
<label for="company_footer"/>
<field name="company_footer" class="oe_inline"/>
</div>
<div>
<field name="module_account_check_writing" class="oe_inline"/>
<label for="module_account_check_writing"/>
</div>
</div>
</group>
<separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
<group name="analytic_account" invisible="1">
<label for="id" string="Settings"/>
<div name="analytic_account"/>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
addons/base_setup/res_config_view.xml
+54 -27
View File
@@ -6,31 +6,46 @@
<field name="model">base.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="General Settings" version="7.0">
<form string="General Settings" version="7.0" 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="Company Settings"/>
<group>
<group string="Company Settings">
<field name="module_multi_company"/>
<separator string="External Accesses" colspan="2"/>
<field name="module_share"/>
<field name="module_portal"/>
</group>
<group>
<label for="id" string="Company"/>
<div>
<div>
You will also find several configuration options on your company data:
address for the header and footer, overdue payments texts, etc.
<field name="module_multi_company" class="oe_inline"/>
<label for="module_multi_company"/>
</div>
<button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
<separator string="Others" colspan="2"/>
<label for="id" string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
</group>
<div>
<label string="You will also find several configuration options on your company data:
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>
</div>
</group>
<separator string="External Accesses"/>
<group>
<label for="id" string="External Accesses"/>
<div>
<div>
<field name="module_share" class="oe_inline"/>
<label for="module_share"/>
</div>
<div>
<field name="module_portal" class="oe_inline"/>
<label for="module_portal"/>
</div>
</div>
</group>
<separator string="Others"/>
<group>
<label for="id" string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute" class="oe_link"/>
</group>
</form>
</field>
@@ -51,22 +66,34 @@
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Sales" version="7.0">
<form string="Configure Sales" version="7.0" 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>
<group>
<group name="config_sale">
<field name="module_crm" invisible="1"/>
<separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
</group>
<group name="config_other">
</group>
<div name="config_sale">
<field name="module_crm" invisible="1"/>
<separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
<div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">
The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.
</div>
<group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
<label for="id" string="On Mail Client"/>
<div>
<div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline">
<field name="module_plugin_thunderbird"/>
<label for="module_plugin_thunderbird"/>
</div>
<div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}">
<field name="module_plugin_outlook" class="oe_inline"/>
<label for="module_plugin_outlook"/>
</div>
</div>
</group>
</div>
<div name="config_other"/>
</form>
</field>
</record>
addons/crm/res_config_view.xml
+53 -19
View File
@@ -8,29 +8,63 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<separator string="Emails" version="7.0" position="after">
<label for="fetchmail_lead"/>
<group name="On Mail Client" version="7.0" position="after">
<group>
<label for="id" string="On Mail Server"/>
<div>
<div name="fetchmail_lead">
<field name="fetchmail_lead" class="oe_inline"/>
<label for="fetchmail_lead"/>
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
</div>
</div>
</group>
</group>
<div name="config_other" version="7.0" position="inside">
<separator string="Import and Synchronize Data from an Other Application"/>
<group>
<label for="id" string="Import From"/>
<div>
<div>
<field name="module_import_sugarcrm"/>
<label for="module_import_sugarcrm"/>
</div>
</div>
</group>
<group>
<label for="id" string="Synchronize with"/>
<div>
<div>
<field name="module_import_google"/>
<label for="module_import_google"/>
</div>
<div>
<field name="module_crm_caldav"/>
<label for="module_crm_caldav"/>
</div>
</div>
</group>
<separator string="Customer Form"/>
<div>
<field name="fetchmail_lead"/>
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
<div>
<field name="module_google_map" class="oe_inline"/>
<label for="module_google_map"/>
</div>
</div>
</separator>
<group name="config_other" version="7.0" position="inside">
<separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
<field name="module_import_sugarcrm"/>
<field name="module_crm_caldav"/>
<field name="module_import_google"/>
<separator string="Customer Form" colspan="2"/>
<field name="module_google_map"/>
</group>
<group name="config_sale" position="inside">
<separator string="Documents and Wiki" colspan="2"/>
<field name="module_wiki_sale_faq"/>
</group>
</div>
<div name="config_sale" position="inside">
<separator string="Documents and Wiki"/>
<div>
<div>
<field name="module_wiki_sale_faq"/>
<label for="module_wiki_sale_faq"/>
</div>
</div>
</div>
</field>
</record>
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
sequence="1" action="base_setup.action_sale_config"/>
addons/crm_claim/res_config_view.xml
+7 -7
View File
@@ -7,16 +7,16 @@
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="priority" eval="20"/> <!-- to put fetchmail_lead before fetchmail_claim -->
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<separator string="Emails" version="7.0" position="after">
<label for="fetchmail_claim"/>
<div name="fetchmail_lead" position="after">
<div>
<field name="fetchmail_claim"/>
<button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
<field name="fetchmail_claim" class="oe_inline"/>
<label for="fetchmail_claim"/>
<button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/>
</div>
</separator>
</div>
</field>
</record>
addons/hr/res_config_view.xml
+45 -15
View File
@@ -20,26 +20,56 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Additional Features"/>
<group>
<group string="Additional Features" name="left_column">
<field name="module_hr_expense"/>
<field name="module_hr_evaluation"/>
<field name="module_hr_holidays"/>
<field name="module_hr_recruitment"/>
<field name="module_hr_contract"/>
<label for="module_hr_payroll"/>
<label for="id" string="Additional Features"/>
<div>
<div>
<field name="module_hr_payroll"/>
<field name="module_hr_expense" class="oe_inline"/>
<label for="module_hr_expense"/>
</div>
<div>
<field name="module_hr_evaluation" class="oe_inline"/>
<label for="module_hr_evaluation"/>
</div>
<div>
<field name="module_hr_holidays" class="oe_inline"/>
<label for="module_hr_holidays"/>
</div>
<div>
<field name="module_hr_recruitment" class="oe_inline"/>
<label for="module_hr_recruitment"/>
</div>
<div>
<field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/>
</div>
<div name="hr_payroll">
<field name="module_hr_payroll" class="oe_inline"/>
<label for="module_hr_payroll"/>
<button name="%(open_payroll_modules)d" type="action"
string="Install Country-Specific Payroll" icon="gtk-go-forward"
attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
</div>
</group>
<group string="Timesheets" name="right_column">
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
<field name="module_hr_timesheet_sheet"/>
</group>
</div>
</group>
<separator string="Timesheets"/>
<group name="timesheet_grp">
<label for="id" string="Timesheet Features"/>
<div>
<div>
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
<label for="module_hr_attendance"/>
</div>
<div>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
<label for="module_hr_timesheet"/>
</div>
<div name="hr_timesheet">
<field name="module_hr_timesheet_sheet" class="oe_inline"/>
<label for="module_hr_timesheet_sheet"/>
</div>
</div>
</group>
</form>
</field>
addons/hr_payroll/res_config_view.xml
+5 -3
View File
@@ -7,9 +7,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
<xpath expr="//group[@name='left_column']" position="inside">
<field name="module_hr_payroll_account"/>
<xpath expr="//div[@name='hr_payroll']" position="after">
<div>
<field name="module_hr_payroll_account" class="oe_inline"/>
<label for="module_hr_payroll_account"/>
</div>
</xpath>
</field>
</record>
addons/hr_recruitment/res_config_view.xml
+17 -9
View File
@@ -7,15 +7,23 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="right_column" position="inside">
<separator string="Recruitment" colspan="2"/>
<field name="module_document_ftp"/>
<label for="fetchmail_applicants"/>
<div>
<field name="fetchmail_applicants"/>
<button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
</div>
<group name="timesheet_grp" position="after">
<separator string="Recruitment"/>
<group>
<label for="id" string="Recruitment Features"/>
<div>
<div>
<field name="module_document_ftp" class="oe_inline"/>
<label for="module_document_ftp"/>
</div>
<div>
<field name="fetchmail_applicants" class="oe_inline"/>
<label for="fetchmail_applicants"/>
<button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
</div>
</div>
</group>
</group>
</field>
</record>
addons/hr_timesheet_sheet/res_config_view.xml
+10 -4
View File
@@ -7,10 +7,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_timesheet_sheet" position="after">
<field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
<field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
</field>
<xpath expr="//div[@name='hr_timesheet']" position="after">
<div>
<label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
<field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
</div>
<div>
<label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
<field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
</div>
</xpath>
</field>
</record>
</data>
addons/knowledge/res_config_view.xml
+32 -11
View File
@@ -1,3 +1,4 @@
<openerp>
<data>
@@ -6,27 +7,47 @@
<field name="model">knowledge.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Knowledge" version="7.0">
<form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
<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="Wiki"/>
<group>
<group string="Wiki">
<field name="module_wiki_faq"/>
<field name="module_wiki_quality_manual"/>
</group>
<group string="Documents">
<field name="module_document"/>
<field name="module_document_ftp"/>
<field name="module_document_webdav"/>
</group>
<label for="id" string="Wiki Settings"/>
<div>
<div>
<field name="module_wiki_faq" class="oe_inline"/>
<label for="module_wiki_faq"/>
</div>
<div>
<field name="module_wiki_quality_manual" class="oe_inline"/>
<label for="module_wiki_quality_manual"/>
</div>
</div>
</group>
<separator string="Documents"/>
<group>
<label for="id" string="Document Settings"/>
<div>
<div>
<field name="module_document" class="oe_inline"/>
<label for="module_document"/>
</div>
<div>
<field name="module_document_ftp" class="oe_inline"/>
<label for="module_document_ftp"/>
</div>
<div>
<field name="module_document_webdav" class="oe_inline"/>
<label for="module_document_webdav"/>
</div>
</div>
</group>
</form>
</field>
</record>
<record id="action_knowledge_configuration" model="ir.actions.act_window">
<field name="name">Configure Knowledge</field>
<field name="res_model">knowledge.config.settings</field>
addons/marketing/res_config_view.xml
+18 -5
View File
@@ -6,17 +6,30 @@
<field name="model">marketing.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Marketing" version="7.0">
<form string="Configure Marketing" class="oe_form_configuration" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Campaigns">
<field name="module_marketing_campaign"/>
<field name="module_marketing_campaign_crm_demo"/>
<field name="module_crm_profiling"/>
<separator string="Campaigns"/>
<group>
<label for="id" string="Campaigns Settings"/>
<div>
<div>
<field name="module_marketing_campaign" class="oe_inline"/>
<label for="module_marketing_campaign"/>
</div>
<div>
<field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
<label for="module_marketing_campaign_crm_demo"/>
</div>
<div>
<field name="module_crm_profiling" class="oe_inline"/>
<label for="module_crm_profiling"/>
</div>
</div>
</group>
</form>
</field>
addons/mrp/res_config_view.xml
+59 -18
View File
@@ -1,38 +1,79 @@
<openerp>
<data>
<record id="view_mrp_config" model="ir.ui.view">
<field name="name">mrp settings</field>
<field name="model">mrp.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Manufacturing" version="7.0">
<form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
<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>
<group string="Manufacturing Order">
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="2"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
</group>
<group string="Products">
<field name="module_product_manufacturer"/>
<separator string="Bill Of Material" colspan="2"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
</group>
<label for="id" string="Order Settings"/>
<div>
<div>
<field name="module_mrp_operations" class="oe_inline"/>
<label for="module_mrp_operations" />
</div>
<div>
<field name="module_stock_planning" class="oe_inline"/>
<label for="module_stock_planning"/>
</div>
<div>
<field name="module_mrp_subproduct" class="oe_inline"/>
<label for="module_mrp_subproduct"/>
</div>
<div>
<field name="module_mrp_repair" class="oe_inline"/>
<label for="module_mrp_repair"/>
</div>
</div>
</group>
<separator string="Logistics" />
<group >
<label for="id" string="Logistics Settings"/>
<div>
<div>
<field name="module_mrp_jit" class="oe_inline"/>
<label for="module_mrp_jit" string="Real-Time"/>
</div>
<div>
<field name="module_stock_no_autopicking" class="oe_inline"/>
<label for="module_stock_no_autopicking" />
</div>
</div>
</group>
<separator string="Products"/>
<group >
<label for="id" string="Product Settings"/>
<div>
<div>
<field name="module_product_manufacturer" class="oe_inline"/>
<label for="module_product_manufacturer"/>
</div>
</div>
</group>
<separator string="Bill Of Material" />
<group >
<label for="id" string="BOM Settings"/>
<div>
<div>
<field name="group_mrp_routings" class="oe_inline"/>
<label for="group_mrp_routings"/>
</div>
<div>
<field name="group_mrp_properties" class="oe_inline"/>
<label for="group_mrp_properties" />
</div>
</div>
</group>
</form>
</field>
</record>
<record id="action_mrp_configuration" model="ir.actions.act_window">
<field name="name">Configure Manufacturing</field>
<field name="type">ir.actions.act_window</field>
addons/plugin_outlook/plugin_outlook.xml
+5 -5
View File
@@ -49,14 +49,14 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_outlook" version="7.0" position="replace">
<label for="module_plugin_outlook"/>
<div name="module_plugin_outlook" version="7.0" position="replace">
<div>
<field name="module_plugin_outlook"/>
<field name="module_plugin_outlook" class="oe_inline"/>
<label for="module_plugin_outlook"/>
<button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/>
</div>
</field>
</div>
</field>
</record>
addons/plugin_thunderbird/plugin_thunderbird.xml
+6 -6
View File
@@ -55,14 +55,14 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_thunderbird" version="7.0" position="replace">
<label for="module_plugin_thunderbird"/>
<div name="module_plugin_thunderbird" version="7.0" position="replace">
<div>
<field name="module_plugin_thunderbird"/>
<button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"
attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/>
<field name="module_plugin_thunderbird" class="oe_inline"/>
<label for="module_plugin_thunderbird"/>
<button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/>
</div>
</field>
</div>
</field>
</record>
addons/project/res_config_view.xml
+56 -18
View File
@@ -6,30 +6,68 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Configure Project" version="7.0">
<form string="Configure Project" version="7.0" 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 and Planing"/>
<group>
<group>
<separator string="Project" colspan="2"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
<field name="group_tasks_work_on_tasks"/>
<field name="group_time_work_estimation_tasks"/>
<field name="group_manage_delegation_task"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
</group>
<group name="project_left_column">
<separator string="Planing" colspan="2"/>
<field name="module_project_long_term"/>
<separator string="Helpdesk and Support" colspan="2"/>
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
</group>
<label for="id" string="Project"/>
<div>
<div>
<field name="module_project_mrp" class="oe_inline"/>
<label for="module_project_mrp"/>
</div>
<div>
<field name="module_project_timesheet" class="oe_inline"/>
<label for="module_project_timesheet"/>
</div>
<div>
<field name="module_pad" class="oe_inline"/>
<label for="module_pad"/>
</div>
<div>
<field name="group_tasks_work_on_tasks" class="oe_inline"/>
<label for="group_tasks_work_on_tasks" />
</div>
<div>
<field name="group_time_work_estimation_tasks" class="oe_inline"/>
<label for="group_time_work_estimation_tasks"/>
</div>
<div>
<field name="group_manage_delegation_task" class="oe_inline"/>
<label for="group_manage_delegation_task"/>
</div>
<div>
<label for="time_unit"/>
<field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
</div>
</div>
</group>
<group>
<label for="id" string="Planing"/>
<div>
<div>
<field name="module_project_long_term" class="oe_inline"/>
<label for="module_project_long_term"/>
</div>
</div>
</group>
<separator string="Helpdesk and Support"/>
<group>
<label for="id" string="Helpdesk and Support"/>
<div>
<div>
<field name="module_project_issue" class="oe_inline"/>
<label for="module_project_issue"/>
</div>
<div name="module_project_issue_sheet">
<field name="module_project_issue_sheet" class="oe_inline"/>
<label for="module_project_issue_sheet"/>
</div>
</div>
</group>
</form>
</field>
addons/project_issue/res_config_view.xml
+9 -8
View File
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_config_settings" model="ir.ui.view">
<field name="name">Project Application</field>
<field name="model">project.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml">
<field name="module_project_issue_sheet" position="after">
<label for="fetchmail_issue"/>
<div name="module_project_issue_sheet" position="after">
<div>
<field name="fetchmail_issue"/>
<button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
<field name="fetchmail_issue" class="oe_inline"/>
<label for="fetchmail_issue"/>
<button name="configure_fetchmail_issue"
type="object"
string="Configure"
icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
</div>
</field>
</div>
</field>
</record>
</data>
</openerp>
addons/purchase/res_config_view.xml
+62 -24
View File
@@ -1,34 +1,64 @@
<openerp>
<data>
<record id="view_purchase_configuration" model="ir.ui.view">
<field name="name">purchase settings</field>
<field name="model">purchase.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Purchases" version="7.0">
<form string="Configure Purchases" class="oe_form_configuration" version="7.0">
<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="Purchase Order"/>
<group>
<group>
<separator string="Purchase Order" colspan="2"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
<field name="group_purchase_delivery_address"/>
<field name="module_purchase_double_validation"/>
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
</group>
<group>
<separator string="Invoicing" colspan="2"/>
<field name="default_invoice_method" class="oe_inline"/>
<field name="decimal_precision" class="oe_inline"/>
</group>
</group>
<label for="id" string="Order Setting"/>
<div>
<div>
<field name="group_purchase_pricelist" class="oe_inline"/>
<label for="group_purchase_pricelist"/>
</div>
<div>
<field name="group_uom" class="oe_inline"/>
<label for="group_uom"/>
</div>
<div>
<field name="group_purchase_delivery_address" class="oe_inline"/>
<label for="group_purchase_delivery_address"/>
</div>
<div name="module_purchase_double_validation">
<field name="module_purchase_double_validation" class="oe_inline"/>
<label for="module_purchase_double_validation"/>
</div>
<div>
<field name="module_purchase_requisition" class="oe_inline"/>
<label for="module_purchase_requisition"/>
</div>
<div>
<field name="module_warning" class="oe_inline"/>
<label for="module_warning"/>
</div>
<div>
<field name="module_purchase_analytic_plans" class="oe_inline"/>
<label for="module_purchase_analytic_plans"/>
</div>
</div>
</group>
<separator string="Invoicing"/>
<group>
<label for="id" string="Invoicing Setting"/>
<div>
<div>
<label for="default_invoice_method"/>
<field name="default_invoice_method" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
</div>
</group>
</form>
</field>
</record>
@@ -51,14 +81,22 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="18"/>
<field name="arch" type="xml">
<separator name="analytic_accounting" position="attributes">
<separator name="analytic_account" position="attributes">
<attribute name="invisible">0</attribute>
<attribute name="colspan">2</attribute>
</separator>
<separator name="analytic_accounting" position="after">
<field name="group_analytic_account_for_purchases"/>
<field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
</separator>
<group name="analytic_account" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<div name="analytic_account" position="inside">
<div>
<field name="group_analytic_account_for_purchases" class="oe_inline"/>
<label for="group_analytic_account_for_purchases"/>
</div>
<div>
<field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)" class="oe_inline"/>
<label for="module_purchase_analytic_plans"/>
</div>
</div>
</field>
</record>
addons/purchase_double_validation/purchase_double_validation_installer.xml
+6 -4
View File
@@ -7,11 +7,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="purchase.view_purchase_configuration"/>
<field name="arch" type="xml">
<field name="module_purchase_double_validation" position="after">
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/>
</field>
<div name="module_purchase_double_validation" position="before">
<div>
<label for="limit_amount"/>
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
</div>
</div>
</field>
</record>
</data>
</openerp>
addons/sale/res_config_view.xml
+128 -34
View File
@@ -8,35 +8,122 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="config_sale" position="inside">
<div name="config_sale" position="before">
<separator string="Invoicing Process"/>
<group>
<label for="id" string="Invoicing Process"/>
<div>
<div>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
<label for="group_invoice_so_lines"/>
</div>
<div>
<field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<label for="group_invoice_deli_orders"/>
</div>
<div>
<field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
<label for="task_work"/>
</div>
<div>
<field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
<label for="timesheet"/>
</div>
</div>
</group>
<group>
<label for="id" string="Default Process" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False),('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False),('task_work','=',False), ('module_account_analytic_analysis','=',False)]}"/>
<div>
<div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
<label for="default_order_policy"/>
<field name="default_order_policy" class="oe_inline"/>
</div>
<div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}">
<field name="module_delivery" class="oe_inline"/>
<label for="module_delivery"/>
</div>
<div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
<label for="time_unit"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
</div>
</div>
</group>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<separator string="Sale Order" colspan="2"/>
<field name="group_uom"/>
<field name="group_sale_delivery_address"/>
<field name="group_sale_pricelist"/>
<field name="group_multiple_shops"/>
<field name="module_warning"/>
<field name="decimal_precision"/>
<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
<field name="group_discount_per_so_line"/>
<field name="module_sale_margin"/>
<field name="module_sale_journal"/>
</group>
<group name="config_other" position="inside">
<separator string="Invoicing Policy" colspan="2" />
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="task_work" on_change="onchange_task_work(task_work)"/>
<field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
<field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
<field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
<separator string="Contracts" colspan="2"/>
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
<field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
</group>
<separator string="Quotations and Sales Orders"/>
<group>
<label for="id" string="Customer Features"/>
<div>
<div>
<field name="group_sale_delivery_address" class="oe_inline"/>
<label for="group_sale_delivery_address"/>
</div>
<div>
<field name="group_sale_pricelist" class="oe_inline"/>
<label for="group_sale_pricelist"/>
</div>
<div>
<field name="module_sale_journal" class="oe_inline"/>
<label for="module_sale_journal"/>
</div>
<div name="module_warning">
<field name="module_warning" class="oe_inline"/>
<label for="module_warning"/>
</div>
</div>
</group>
<group>
<label for="id" string="Product Features"/>
<div>
<div>
<field name="group_uom" class="oe_inline"/>
<label for="group_uom"/>
</div>
<div>
<field name="group_discount_per_so_line" class="oe_inline"/>
<label for="group_discount_per_so_line"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
</div>
</group>
<group>
<label for="id" string="Sale Features"/>
<div>
<div>
<field name="group_multiple_shops" class="oe_inline"/>
<label for="group_multiple_shops"/>
</div>
<div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
<field name="default_picking_policy" class="oe_inline"/>
<label for="default_picking_policy"/>
</div>
<div name="module_sale_margin">
<field name="module_sale_margin" class="oe_inline"/>
<label for="module_sale_margin"/>
</div>
</div>
</group>
<separator string="Contracts Management"/>
<div style="color:grey">
Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer
</div>
<group>
<label for="id" string="Contract Feature"/>
<div>
<div>
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
<label for="module_account_analytic_analysis"/>
</div>
<div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
<field name="module_analytic_user_function" class="oe_inline"/>
<label for="module_analytic_user_function"/>
</div>
</div>
</group>
</div>
</field>
</record>
@@ -50,16 +137,23 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<separator name="analytic_accounting" position="attributes">
<separator name="analytic_account" position="attributes">
<attribute name="invisible">0</attribute>
<attribute name="colspan">2</attribute>
</separator>
<separator name="analytic_accounting" position="after">
<field name="group_analytic_account_for_sales"/>
<field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
</separator>
<group name="analytic_account" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<div name="analytic_account" position="inside">
<div>
<field name="group_analytic_account_for_sales" class="oe_inline"/>
<label for="group_analytic_account_for_sales"/>
</div>
<div>
<field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)" class="oe_inline"/>
<label for="module_sale_analytic_plans"/>
</div>
</div>
</field>
</record>
</data>
</openerp>
addons/stock/res_config_view.xml
+73 -21
View File
@@ -7,36 +7,88 @@
<field name="model">stock.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Warehouse" version="7.0">
<form string="Configure Warehouse" version="7.0" 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>
<group>
<div>
<separator string="Traceability &amp; Logistics"/>
<group>
<separator string="Traceability" colspan="2"/>
<field name="group_stock_production_lot"/>
<field name="group_stock_tracking_lot"/>
<field name="module_product_expiry"
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
<separator string="Logistics" colspan="2"/>
<field name="group_stock_multiple_locations"/>
<field name="module_stock_invoice_directly"/>
<field name="module_stock_location"/>
<field name="decimal_precision" class="oe_inline"/>
<label for="id" string="Traceability"/>
<div>
<div>
<field name="group_stock_production_lot" class="oe_inline"/>
<label for="group_stock_production_lot"/>
</div>
<div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
<field name="module_product_expiry" class="oe_inline"/>
<label for="module_product_expiry"/>
</div>
<div>
<field name="group_stock_tracking_lot" class="oe_inline"/>
<label for="group_stock_tracking_lot"/>
</div>
</div>
</group>
<group>
<separator string="Partners" colspan="2"/>
<field name="module_claim_from_delivery"/>
<separator string="Products" colspan="2"/>
<field name="group_stock_packaging"/>
<field name="group_uom"/>
<field name="group_uos"/>
<field name="group_stock_inventory_valuation" class="oe_inline"/>
<field name="group_product_variant"/>
<label for="id" string="Logistics"/>
<div>
<div>
<field name="group_stock_multiple_locations" class="oe_inline"/>
<label for="group_stock_multiple_locations"/>
</div>
<div>
<field name="module_stock_invoice_directly" class="oe_inline"/>
<label for="module_stock_invoice_directly"/>
</div>
<div>
<field name="module_stock_location" class="oe_inline"/>
<label for="module_stock_location"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
</div>
</group>
</group>
</div>
<div>
<separator string="Partners &amp; Products"/>
<group>
<label for="id" string="Partners"/>
<div>
<field name="module_claim_from_delivery" class="oe_inline"/>
<label for="module_claim_from_delivery"/>
</div>
</group>
<group>
<label for="id" string="Products"/>
<div>
<div>
<field name="group_stock_packaging" class="oe_inline"/>
<label for="group_stock_packaging"/>
</div>
<div>
<field name="group_uom" class="oe_inline"/>
<label for="group_uom"/>
</div>
<div>
<field name="group_uos" class="oe_inline"/>
<label for="group_uos" string="Unit of Measure (for Sale)"/>
</div>
<div>
<field name="group_stock_inventory_valuation" class="oe_inline"/>
<label for="group_stock_inventory_valuation"/>
</div>
<div>
<field name="group_product_variant" class="oe_inline"/>
<label for="group_product_variant"/>
</div>
</div>
</group>
</div>
</form>
</field>
</record>