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

[MERGE] settings: usability, review of form views

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120716142314-2htvjeqoiq8vrcxw
This commit is contained in:
Quentin (OpenERP)
2012-07-16 16:23:14 +02:00
parent e6d4537f5b b1d19923de
commit 1fd92244d2
35 changed files with 306 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/company_view.xml
+5 -5
View File
@@ -22,11 +22,11 @@
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="property_reserve_and_surplus_account" colspan="2"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</field>
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="property_reserve_and_surplus_account"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</xpath>
</field>
</record>
addons/account/res_config_view.xml
+20 -35
View File
@@ -21,7 +21,6 @@
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"/>
@@ -34,7 +33,6 @@
<field name="expects_chart_of_accounts"/>
</group>
<div class="oe_form_button_save_dirty">
<group string="Select a Chart of Accounts to Install"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<group>
@@ -51,9 +49,7 @@
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
</group>
</div>
<div class="oe_form_button_save_dirty">
<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"/>
@@ -63,78 +59,67 @@
</div>
<field name="period"/>
</group>
</div>
<group string="Accounting Configuration">
<group>
<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"/>
</group>
<group>
<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"/>
</group>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<group>
<group string="Customer Invoices">
<separator string="Customer Invoices" colspan="2"/>
<label for="sale_sequence_next"/>
<group>
<field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
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)]}"/>
<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_refund_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<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 string="Supplier Invoices">
<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"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<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_refund_sequence_prefix" class="oe_inline" nolabel="1"
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" nolabel="1"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
<field name="purchase_refund_sequence_next" class="oe_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
</group>
<field name="module_account_payment"/>
</group>
<group string="Electronic Payments">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</group>
<group string="Bank &amp; Cash">
<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>
<group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
</form>
</field>
</record>
addons/account_check_writing/account_view.xml
+2 -4
View File
@@ -31,11 +31,9 @@
<field name="priority">17</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<separator string="Default Check Layout" colspan="4"/>
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="check_layout"/>
<newline/>
</page>
</xpath>
</field>
</record>
</data>
addons/account_voucher/account_voucher_view.xml
+2 -2
View File
@@ -272,8 +272,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="income_currency_exchange_account_id" colspan="2"/>
<field name="expense_currency_exchange_account_id" colspan="2"/>
<field name="income_currency_exchange_account_id"/>
<field name="expense_currency_exchange_account_id"/>
</field>
</field>
</record>
addons/auth_openid/res_users.xml
+4 -2
View File
@@ -9,8 +9,10 @@
<field name="arch" type="xml">
<notebook colspan="4" position="inside">
<page string="OpenID">
<field name="openid_url"/>
<field name="openid_email"/>
<group>
<field name="openid_url"/>
<field name="openid_email"/>
</group>
</page>
</notebook>
</field>
addons/base_setup/res_config_view.xml
+20 -18
View File
@@ -12,9 +12,12 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Company Settings">
<group>
<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>
<div>
@@ -22,16 +25,12 @@
address for the header and footer, overdue payments texts, etc.
</div>
<button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
</group>
</group>
<group string="External Accesses">
<field name="module_share"/>
<field name="module_portal"/>
</group>
<group string="Others">
<label for="id" string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
<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>
</group>
</form>
</field>
@@ -58,13 +57,16 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<field name="module_crm" invisible="1"/>
<group name="config_sale"/>
<group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
<field name="module_plugin_thunderbird"/>
<field name="module_plugin_outlook"/>
</group>
<group name="config_crm"/>
<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>
</group>
</form>
</field>
</record>
addons/crm/res_config_view.xml
+11 -15
View File
@@ -8,29 +8,25 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="config_fetchmail" version="7.0" position="inside">
<separator string="Emails" version="7.0" position="after">
<label for="fetchmail_lead"/>
<div>
<field name="fetchmail_lead"/>
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
</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_crm" position="after">
<group string="Import and Synchronize Data from an Other Application">
<field name="module_import_sugarcrm"/>
<field name="module_crm_caldav"/>
<field name="module_import_google"/>
</group>
<group string="Documents and Wiki">
<group name="config_sale" position="inside">
<separator string="Documents and Wiki" colspan="2"/>
<field name="module_wiki_sale_faq"/>
</group>
<group string="Customer Form">
<field name="module_google_map"/>
</group>
</group>
</field>
</record>
addons/crm_claim/res_config_view.xml
+2 -2
View File
@@ -9,14 +9,14 @@
<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="arch" type="xml">
<group name="config_fetchmail" version="7.0" position="inside">
<separator string="Emails" version="7.0" position="after">
<label for="fetchmail_claim"/>
<div>
<field name="fetchmail_claim"/>
<button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
</div>
</group>
</separator>
</field>
</record>
addons/document/document_view.xml
+1 -1
View File
@@ -368,7 +368,7 @@
<field name="priority" eval="1"/>
<field name="arch" type="xml">
<field name="subflow_id" position="after">
<field name="directory_id" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/>
<field name="directory_id" string="Document Directory" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/>
<newline/>
</field>
</field>
addons/email_template/email_template_view.xml
+20 -25
View File
@@ -17,20 +17,13 @@
<notebook>
<page string="Email Details">
<group>
<group string="Addresses">
<field name="email_from" required="1"/>
<field name="email_to" required="1"/>
<field name="email_cc"/>
<field name="email_bcc"/>
<field name="reply_to"/>
</group>
<group string="Options">
<field name="lang"/>
<field name="user_signature"/>
</group>
<group string="Email Content">
<field name="subject" required="1"/>
<notebook colspan="2">
<notebook colspan="4">
<page string="Body (Text)">
<field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
</page>
@@ -39,22 +32,21 @@
<label string="Note: This is Raw HTML." colspan="4"/>
</page>
</notebook>
</group>
<field name="user_signature"/>
<notebook colspan="4">
<page string="Dynamic Values Builder">
<field name="model_object_field"
domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
on_change="onchange_sub_model_object_value_field(model_object_field)"
colspan="4"/>
<field name="sub_object" readonly="1" colspan="4"/>
<field name="sub_model_object_field"
domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
colspan="4"
attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
<field name="null_value" colspan="4"
on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
<field name="copyvalue" colspan="4"/>
<group>
<field name="model_object_field"
domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
on_change="onchange_sub_model_object_value_field(model_object_field)"/>
<field name="sub_object" readonly="1"/>
<field name="sub_model_object_field"
domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
<field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
<field name="copyvalue"/>
</group>
</page>
</notebook>
<button name="%(wizard_email_template_preview)d" string="Preview Template"
@@ -82,15 +74,18 @@
<field name="track_campaign_item"/>
<field name="message_id"/>
<field name="auto_delete"/>
<field name="lang"/>
</group>
</group>
<group colspan="2" col="2">
<separator string="Attachments" colspan="2"/>
<notebook colspan="2">
<page string="Attach Report">
<field name="report_template" colspan="4"
domain="[('model','=',model)]"/>
<field name="report_name" colspan="4" />
<group>
<field name="report_template" colspan="4"
domain="[('model','=',model)]"/>
<field name="report_name" colspan="4" />
</group>
</page>
<page string="Attach existing files">
<field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
addons/google_base_account/google_base_account_view.xml
+4 -3
View File
@@ -9,9 +9,10 @@
<field name="arch" type="xml">
<xpath expr="//notebook" position="inside">
<page string="Synchronization">
<separator string="Google Account" colspan="4"/>
<field name="gmail_user"/>
<field name="gmail_password" password="True"/>
<group string="Google Account" colspan="4">
<field name="gmail_user"/>
<field name="gmail_password" password="True"/>
</group>
</page>
</xpath>
</field>
addons/hr/res_config_view.xml
+3 -8
View File
@@ -20,13 +20,11 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Additional Features">
<group>
<group>
<group string="Additional Features" name="left_column">
<field name="module_hr_expense"/>
<field name="module_hr_evaluation"/>
<field name="module_hr_holidays"/>
</group>
<group>
<field name="module_hr_recruitment"/>
<field name="module_hr_contract"/>
<label for="module_hr_payroll"/>
@@ -37,14 +35,11 @@
attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
</div>
</group>
</group>
<group>
<group string="Timesheets">
<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>
<group name="config_recruitment"/>
</group>
</form>
</field>
addons/hr_payroll/res_config_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<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="//field[@name='module_hr_payroll']/.." position="after">
<xpath expr="//group[@name='left_column']" position="inside">
<field name="module_hr_payroll_account"/>
</xpath>
</field>
addons/hr_recruitment/res_config_view.xml
+9 -10
View File
@@ -7,16 +7,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="config_recruitment" position="replace">
<group name="config_recruitment" string="Recruitment">
<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>
<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>
</field>
</record>
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+6 -6
View File
@@ -200,12 +200,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<separator string="Timesheets" colspan="4"/>
<field name="timesheet_range"/>
<field name="timesheet_max_difference"/>
<newline/>
</page>
<xpath expr="//group[@name='account_grp']" position="after">
<group name="timesheets_grp" string="Timesheets">
<field name="timesheet_range"/>
<field name="timesheet_max_difference"/>
</group>
</xpath>
</field>
</record>
addons/knowledge/res_config_view.xml
-1
View File
@@ -11,7 +11,6 @@
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group string="Wiki">
addons/l10n_ch/company_view.xml
+16 -16
View File
@@ -7,22 +7,22 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<field name="rml_footer2" position="after">
<newline/>
<group string="BVR data" colspan="4">
<field name="bvr_delta_horz"/>
<field name="bvr_delta_vert"/>
<field name="bvr_scan_line_vert"/>
<field name="bvr_scan_line_horz"/>
<field name="bvr_scan_line_font_size"/>
<field name="bvr_scan_line_letter_spacing"/>
<field name="bvr_background"/>
<field name="bvr_only"/>
<field name="invoice_only"/>
</group>
<newline/>
</field>
<xpath expr="//notebook" position="inside">
<page string="BVR Data">
<group colspan="4">
<field name="bvr_delta_horz"/>
<field name="bvr_delta_vert"/>
<field name="bvr_scan_line_vert"/>
<field name="bvr_scan_line_horz"/>
<field name="bvr_scan_line_font_size"/>
<field name="bvr_scan_line_letter_spacing"/>
<field name="bvr_background"/>
<field name="bvr_only"/>
<field name="invoice_only"/>
</group>
</page>
</xpath>
</field>
</record>
</data>
</openerp>
</openerp>
addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
+3 -3
View File
@@ -11,15 +11,15 @@
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//notebook" position="inside">
<page string="Paie">
<xpath expr="//group[@name='account_grp']" position="after">
<group string="Paie">
<field name="plafond_secu"/>
<field name="nombre_employes"/>
<newline/>
<field name="org_ss"/>
<newline/>
<field name="conv_coll"/>
</page>
</group>
</xpath>
</data>
</field>
addons/mrp/company_view.xml
+3 -5
View File
@@ -9,11 +9,9 @@
<field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group>
<field name="manufacturing_lead"/>
</group>
</page>
<xpath expr="//group[@name='logistics_grp']" position="inside">
<field name="manufacturing_lead"/>
</xpath>
</field>
</record>
addons/mrp/res_config_view.xml
+16 -16
View File
@@ -12,22 +12,22 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Manufacturing Order">
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
</group>
<group string="Logistics">
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
</group>
<group string="Bill Of Material">
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
</group>
<group string="Products">
<field name="module_product_manufacturer"/>
<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>
</group>
</form>
</field>
addons/multi_company/res_company_view.xml
+13 -12
View File
@@ -26,17 +26,18 @@
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<form string="Multi Company">
<group col="6" colspan="4">
<field name="name" colspan="6"/>
<separator string="Matching" colspan="6"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="object_id"/>
<field name="field_id" domain="[('model_id','=',object_id)]"/>
<separator string="Condition" colspan="6"/>
<field name="expression" colspan="4"/>
<field name="sequence"/>
<separator string="Returning" colspan="6"/>
<field name="company_dest_id"/>
<group>
<group>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_dest_id"/>
</group>
<group>
<field name="object_id"/>
<field name="field_id" domain="[('model_id','=',object_id)]"/>
<field name="expression"/>
<field name="sequence"/>
</group>
</group>
</form>
</field>
@@ -71,7 +72,7 @@
parent="base.menu_custom"
sequence="50"/>
<menuitem id="menu_action_inventory_form"
<menuitem id="base.menu_action_inventory_form"
action="action_inventory_form"
parent="menu_custom_multicompany"/>
</data>
addons/pad/res_company.xml
+4 -3
View File
@@ -6,9 +6,10 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='Configuration']" position="inside">
<separator string="Pad" colspan="4"/>
<field name="pad_url_template"/>
<xpath expr="//group[@name='account_grp']" position="after">
<group string="Pads">
<field name="pad_url_template"/>
</group>
</xpath>
</field>
</record>
addons/portal/portal_view.xml
+13 -15
View File
@@ -38,11 +38,19 @@ the portal's users.
<field name="arch" type="xml">
<page string="Users" position="before">
<page string="Portal">
<group colspan="4" col="2">
<separator string="Website" colspan="2"/>
<field name="url" widget="url"/>
</group>
<group colspan="2" col="2">
<group>
<group>
<field name="url" widget="url" string="Portal URL"/>
<field name="home_action_id"/>
</group>
<group>
<field name="override_menu"/>
<field name="parent_menu_id"
context="{'ir.ui.menu.full_list': True}"/>
<label colspan="1"/>
<button name="do_create_menu" type="object"
string="Create Parent Menu"/>
</group>
<separator string="Widgets Assigned to Users" colspan="2"/>
<field name="widget_ids" nolabel="1" colspan="2">
<tree string="Widgets" editable="bottom">
@@ -51,16 +59,6 @@ the portal's users.
</tree>
</field>
</group>
<group colspan="2" col="2">
<separator string="Portal Menu" colspan="2"/>
<field name="override_menu"/>
<field name="parent_menu_id"
context="{'ir.ui.menu.full_list': True}"/>
<label colspan="1"/>
<button name="do_create_menu" type="object"
string="Create Parent Menu"/>
<field name="home_action_id"/>
</group>
</page>
</page>
</field>
addons/process/process_view.xml
+21 -13
View File
@@ -30,13 +30,17 @@
<field name="flow_start"/>
</tree>
<form string="Process Node" version="7.0">
<group colspan="4" col="4">
<field name="name"/>
<field name="flow_start"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
<group>
<group>
<field name="name"/>
<field name="flow_start"/>
</group>
<group>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
</group>
<notebook colspan="4">
<page string="Properties">
<group colspan="4" col="6">
@@ -156,13 +160,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process Node" version="7.0">
<sheet >
<group colspan="4" col="6">
<field name="name"/>
<field name="process_id"/>
<field name="flow_start"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
<sheet layout="auto">
<group>
<group>
<field name="name"/>
<field name="process_id"/>
<field name="flow_start"/>
</group>
<group>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
</group>
<notebook>
<page string="Properties">
addons/procurement/company_view.xml
+6 -5
View File
@@ -9,12 +9,13 @@
<field name="priority">17</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
<field name="schedule_range"/>
</page>
<xpath expr="//group[@name='account_grp']" position="after">
<group name="logistics_grp" string="Logistics">
<field name="schedule_range"/>
</group>
</xpath>
</field>
</record>
</data>
</openerp>
</openerp>
addons/project/project_view.xml
+3 -3
View File
@@ -817,11 +817,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group string="Project Management">
<xpath expr="//group[@name='account_grp']" position="after">
<group name="project_grp" string="Projects">
<field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
</group>
</page>
</xpath>
</field>
</record>
addons/project/res_config_view.xml
+9 -10
View File
@@ -12,25 +12,24 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Project">
<group>
<group>
<separator string="Project" colspan="2"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
</group>
<group>
<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>
<group string="Planning">
<field name="module_project_long_term"/>
</group>
<group string="Helpdesk and Support" name="support">
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
<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>
</group>
</form>
</field>
addons/project_issue/res_config_view.xml
+2 -2
View File
@@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml">
<group name="support" position="inside">
<field name="module_project_issue_sheet" position="after">
<label for="fetchmail_issue"/>
<div>
<field name="fetchmail_issue"/>
<button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
</div>
</group>
</field>
</field>
</record>
addons/purchase/company_view.xml
+2 -4
View File
@@ -9,11 +9,9 @@
<field name="priority">19</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group>
<xpath expr="//group[@name='logistics_grp']" position="inside">
<field name="po_lead"/>
</group>
</page>
</xpath>
</field>
</record>
addons/purchase/res_config_view.xml
+12 -11
View File
@@ -12,22 +12,22 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Invoicing">
<field name="default_invoice_method"/>
<field name="decimal_precision"/>
</group>
<group 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"/>
</group>
<group>
<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>
</form>
</field>
@@ -51,13 +51,14 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="18"/>
<field name="arch" type="xml">
<group name="analytic_accounting" position="attributes">
<separator name="analytic_accounting" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<group name="analytic_accounting" position="inside">
<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)"/>
</group>
</separator>
</field>
</record>
addons/resource/resource_view.xml
+1 -2
View File
@@ -136,10 +136,9 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Working Time" version="7.0">
<group>
<group>
<field name="name"/>
<field name="date_from"/>
<field name="dayofweek"/>
<label for="hour_from" string="Hours"/>
<div>
<field name="hour_from" widget="float_time" class="oe_inline"/> -
addons/sale/company_view.xml
+3 -3
View File
@@ -8,9 +8,9 @@
<field name="priority">24</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<field name="security_lead"/>
</page>
<xpath expr="//group[@name='logistics_grp']" position="inside">
<field name="security_lead"/>
</xpath>
</field>
</record>
</data>
addons/sale/res_config_view.xml
+31 -41
View File
@@ -8,45 +8,34 @@
<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="after">
<group name="config_sale" position="inside">
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<group string="Invoicing Policy">
<group>
<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)"/>
</group>
<group>
<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)]}"/>
</group>
</group>
<group string="Sale Order">
<group>
<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"/>
</group>
<group>
<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>
<group string="Contracts">
<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="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>
</field>
</record>
@@ -61,13 +50,14 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<group name="analytic_accounting" position="attributes">
<separator name="analytic_accounting" position="attributes">
<attribute name="invisible">0</attribute>
</group>
<group name="analytic_accounting" position="inside">
<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)"/>
</group>
</separator>
</field>
</record>
addons/stock/res_config_view.xml
+15 -21
View File
@@ -13,36 +13,30 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group string="Traceability">
<field name="group_stock_production_lot"/>
<field name="group_stock_tracking_lot"/>
<field name="module_product_expiry"
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
</group>
<group string="Logistics">
<group>
<group>
<field name="group_stock_multiple_locations"/>
<field name="module_stock_invoice_directly"/>
<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"/>
</group>
<group>
<field name="module_stock_location"/>
<field name="decimal_precision"/>
</group>
</group>
<group string="Products">
<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"/>
</group>
<group>
<field name="group_stock_inventory_valuation"/>
<field name="group_stock_inventory_valuation" class="oe_inline"/>
<field name="group_product_variant"/>
</group>
</group>
<group string="Partners">
<field name="module_claim_from_delivery"/>
</group>
</form>
</field>
</record>
addons/users_ldap/users_ldap_view.xml
+23 -21
View File
@@ -7,30 +7,32 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='Configuration']" position="inside">
<field name="ldaps" nolabel="1" colspan="4">
<form string="LDAP Configuration" version="7.0">
<group col="4">
<xpath expr="//group[@name='account_grp']" position="after">
<group string="LDAP Parameters">
<field name="ldaps" nolabel="1" colspan="4">
<form string="LDAP Configuration" version="7.0">
<group col="4">
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="create_user"/>
<field name="user"/>
<newline/>
<field name="sequence"/>
<field name="ldap_tls"/>
</group>
</form>
<tree string="LDAP Configuration">
<field name="sequence"/>
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="create_user"/>
<field name="user"/>
<newline/>
<field name="sequence"/>
<field name="ldap_tls"/>
</group>
</form>
<tree string="LDAP Configuration">
<field name="sequence"/>
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_base"/>
</tree>
</field>
</tree>
</field>
</group>
</xpath>
</field>
</record>