odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REV] settings: reverted to revision 6971, for usability purposes 

bzr revid: qdp-launchpad@openerp.com-20120716134314-os07j9sxreqc39tl
This commit is contained in:
Quentin (OpenERP) 2012-07-16 15:43:14 +02:00
parent 3dab31051b
commit b1d19923de
13 changed files with 111 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/company_view.xml
View File

@ -25,7 +25,7 @@
<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"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</xpath>
</field>
</record>

13
addons/account/res_config_view.xml
View File

@ -61,7 +61,8 @@
</group>
<group>
<group name="account_config" string="Accounting Configuration">
<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"/>
@ -72,8 +73,7 @@
<field name="tax_calculation_rounding_method"/>
<field name="module_account_asset"/>
<field name="module_account_budget"/>
</group>
<group name="customer_inv_grp" 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"
@ -91,7 +91,8 @@
<field name="group_proforma_invoices"/>
<separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
<group name="supplier_inv_grp" 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"
@ -106,9 +107,9 @@
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
</group>
<field name="module_account_payment"/>
<separator string="Electronic Payments"/>
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
<separator 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"/>

32
addons/base_setup/res_config_view.xml
View File

@ -15,23 +15,22 @@
<group>
<group string="Company Settings">
<field name="module_multi_company"/>
</group>
<group string="External Accesses">
<separator string="External Accesses" colspan="2"/>
<field name="module_share"/>
<field name="module_portal"/>
</group>
<group>
</group>
<group>
<div>
You will also find several configuration options on your company data:
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 string="Others">
<label for="id" string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
</group>
<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,11 +57,14 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group name="config_sale">
<field name="module_crm" invisible="1"/>
<group name="Emails" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
<field name="module_plugin_thunderbird"/>
<field name="module_plugin_outlook"/>
<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>

23
addons/crm/res_config_view.xml
View File

@ -8,26 +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="Emails" 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_sale" version="7.0" position="inside">
<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="Customer Form">
<field name="module_google_map"/>
</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>
</field>
</record>

4
addons/crm_claim/res_config_view.xml
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="Emails" 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>

6
addons/hr/res_config_view.xml
View File

@ -20,8 +20,8 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group name="hr_grp">
<group string="Additional Features" name="add_feature">
<group>
<group string="Additional Features" name="left_column">
<field name="module_hr_expense"/>
<field name="module_hr_evaluation"/>
<field name="module_hr_holidays"/>
@ -35,7 +35,7 @@
attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
</div>
</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"/>

2
addons/hr_payroll/res_config_view.xml
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="//group[@name='add_feature']" position="inside">
<xpath expr="//group[@name='left_column']" position="inside">
<field name="module_hr_payroll_account"/>
</xpath>
</field>

19
addons/hr_recruitment/res_config_view.xml
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="hr_grp" position="inside">
<group 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>

10
addons/mrp/res_config_view.xml
View File

@ -18,17 +18,15 @@
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
</group>
<group string="Bill Of Material">
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
</group>
<group string="Logistics">
<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>

19
addons/project/res_config_view.xml
View File

@ -13,7 +13,8 @@
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group string="Project">
<group>
<separator string="Project" colspan="2"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
@ -21,14 +22,14 @@
<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 string="Planing">
<field name="module_project_long_term"/>
</group>
<group string="Helpdesk and Support">
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
</group>
</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>
</group>
</form>
</field>

6
addons/purchase/res_config_view.xml
View File

@ -13,7 +13,8 @@
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group string="Purchase Order">
<group>
<separator string="Purchase Order" colspan="2"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
<field name="group_purchase_delivery_address"/>
@ -22,7 +23,8 @@
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
</group>
<group string="Invoicing">
<group>
<separator string="Invoicing" colspan="2"/>
<field name="default_invoice_method" class="oe_inline"/>
<field name="decimal_precision" class="oe_inline"/>
</group>

55
addons/sale/res_config_view.xml
View File

@ -9,34 +9,33 @@
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="config_sale" position="inside">
<group string="Sale Order">
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<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 string="Invoicing Policy">
<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)]}"/>
</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>
<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>
</field>
</record>

30
addons/stock/res_config_view.xml
View File

@ -14,28 +14,28 @@
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group string="Logistics">
<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>
<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 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"/>
<field name="group_stock_inventory_valuation" class="oe_inline"/>
<field name="group_product_variant"/>
</group>
<group string="Partners">
<field name="module_claim_from_delivery"/>
</group>
<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>
</form>
</field>