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

[MERGE] sales/crm: usability, review of form views 

bzr revid: qdp-launchpad@openerp.com-20120719093701-wm71yni5c46hv8p6
This commit is contained in:
Quentin (OpenERP) 2012-07-19 11:37:01 +02:00
parent 6dc3b76255 e1d6ecb015
commit 37dbbe8dde
22 changed files with 137 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
addons/account/partner_view.xml
View File

@ -76,56 +76,56 @@
<field name="arch" type="xml">
<page string="History" position="before" version="7.0">
<page string="Accounting" col="4">
<group col="4">
<group string="Customer Accounting Properties" col="4">
<group>
<group>
<field name="property_account_receivable" groups="account.group_account_invoice" />
<field name="property_account_position" widget="selection"/>
<field name="property_payment_term" widget="selection"/>
</group>
<group string="Supplier Accounting Properties" col="4">
<group>
<field name="property_account_payable" groups="account.group_account_invoice"/>
</group>
<group string="Customer Credit" col="4">
<group>
<field name="credit"/>
<field name="credit_limit"/>
</group>
<group string="Supplier Debit" col="4">
<group>
<field name="debit"/>
</group>
<field name="bank_ids">
<form string="Bank account" version="7.0">
<field name="state"/>
<field name="acc_number"/>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name"/>
<field name="bank_bic" placeholder="[Identifier code]"/>
</group>
</group>
</form>
<tree string="Bank Details">
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
<field name="owner_name"/>
</tree>
</field>
</group>
<field name="bank_ids">
<form string="Bank account" version="7.0">
<field name="state"/>
<field name="acc_number"/>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name"/>
<field name="bank_bic" placeholder="e.g. GEBABEBB"/>
</group>
</group>
</form>
<tree string="Bank Details">
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
<field name="owner_name"/>
</tree>
</field>
</page>
</page>
</field>

1
addons/account/project/project_view.xml
View File

@ -118,6 +118,7 @@
<field name="name">account.analytic.line.form</field>
<field name="model">account.analytic.line</field>
<field name="type">form</field>
<field name="priority">1</field>
<field name="arch" type="xml">
<form string="Analytic Entry" version="7.0">
<group>

4
addons/base_calendar/base_calendar.py
View File

@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
'count': fields.integer('Repeat', help="Repeat x times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),

22
addons/crm_claim/crm_claim_view.xml
View File

@ -248,17 +248,6 @@
</field>
</record>
<record id="base.view_crm_partner_info_History1" model="ir.ui.view">
<field name="name">res.partner.crm.history.inherit1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_claim_partner_info_form1" model="ir.ui.view">
<field name="name">res.partner.claim.info.form</field>
<field name="model">res.partner</field>
@ -266,15 +255,18 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="priority">20</field>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='History']" position="inside">
<xpath expr="//page[@name='page_history']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
<group name="grp_claim" string="Claim">
<field name="claims_ids" colspan="4" nolabel="1">
<tree string="Partners Claim" editable="bottom">
<field name="name"/>
</tree>
</field>
</xpath>
</data>
</group>
</xpath>
</field>
</record>

2
addons/crm_fundraising/crm_fundraising_menu.xml
View File

@ -9,7 +9,7 @@
parent="base.menu_base_partner" sequence="8" />
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
<field name="name">Funds</field>
<field name="name">Fund Raising</field>
<field name="res_model">crm.fundraising</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>

57
addons/event/res_partner_view.xml
View File

@ -4,8 +4,8 @@
<!-- Partners inherited form -->
<record id="view_speaker_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.speaker.info.inherit</field>
<record id="view_event_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.event.info.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
@ -13,33 +13,32 @@
<field name="supplier" position="after">
<field name="speaker"/>
</field>
</field>
</record>
<record id="view_event_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.event.info.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<field name="event_ids" colspan="4" nolabel="1">
<tree string="Events">
<field name="name" string="Event"/>
<field name="main_speaker_id"/>
</tree>
</field>
<field name="event_registration_ids" colspan="4" nolabel="1">
<tree string="Events Registration">
<field name="event_begin_date" string="Date"/>
<field name="event_id" />
<field name="nb_register"/>
<field name="state"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
</tree>
</field>
</page>
<xpath expr="//page[@name='page_history']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
<group name="grp_event" string="Event">
<field name="event_ids" colspan="4" nolabel="1">
<tree string="Events">
<field name="name" string="Event"/>
<field name="main_speaker_id"/>
</tree>
</field>
</group>
<group name="grp_registration" string="Registration">
<field name="event_registration_ids" colspan="4" nolabel="1">
<tree string="Events Registration">
<field name="event_begin_date" string="Date"/>
<field name="event_id" />
<field name="nb_register"/>
<field name="state"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
</tree>
</field>
</group>
</xpath>
</field>
</record>

2
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -114,7 +114,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_line_form"/>
<field name="arch" type="xml">
<field name="product_uom_id" position="after">
<field name="amount" position="before">
<field name="to_invoice"/>
<field name="invoice_id"/>
</field>

2
addons/import_sugarcrm/import_sugarcrm_view.xml
View File

@ -13,7 +13,7 @@
<button name="import_all" string="_Import"
type="object" class="oe_highlight"/>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
type="object" class="oe_highlight" />
type="object"/> or
<button special="cancel" string="_Cancel" class="oe_link"/>
</header>
<sheet>

4
addons/l10n_fr_rib/bank_view.xml
View File

@ -9,7 +9,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
<xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
<newline />
<field name="bank_code" />
<field name="office" />
@ -17,7 +17,7 @@
<field name="key" />
<newline />
</xpath>
<xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<field name="rib_acc_number"/>
</xpath>
</data>

24
addons/marketing_campaign/res_partner_view.xml
View File

@ -2,27 +2,21 @@
<openerp>
<data>
<!-- Partners inherited form -->
<record id="base.view_crm_partner_info_History" model="ir.ui.view">
<field name="name">res.partner.crm.history.inherit1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<!-- Partners inherited form -->
<record id="view_workitem_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.workitem.info.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<field name="workitem_ids" colspan="4" nolabel="1"/>
</page>
<xpath expr="//page[@name='page_history']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
<group name="grp_campaign" string="Campaign">
<field name="workitem_ids" colspan="4" nolabel="1"/>
</group>
</xpath>
</field>
</record>
</data>

12
addons/membership/membership.py
View File

@ -315,11 +315,11 @@ class Partner(osv.osv):
return self._membership_state(*args, **kwargs)
_columns = {
'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
'membership_amount': fields.float(
'Membership amount', digits=(16, 2),
'Membership Amount', digits=(16, 2),
help = 'The price negotiated by the partner'),
'membership_state': fields.function(
__get_membership_state,
@ -338,7 +338,7 @@ class Partner(osv.osv):
-Paid Member: A member who has paid the membership amount."""),
'membership_start': fields.function(
_membership_date, multi = 'membeship_start',
string = 'Start membership date', type = 'date',
string = 'Start Membership Date', type = 'date',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@ -346,7 +346,7 @@ class Partner(osv.osv):
}, help="Date from which membership becomes active."),
'membership_stop': fields.function(
_membership_date,
string = 'Stop membership date', type='date', multi='membership_stop',
string = 'Stop Membership Date', type='date', multi='membership_stop',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10),
@ -354,7 +354,7 @@ class Partner(osv.osv):
}, help="Date until which membership remains active."),
'membership_cancel': fields.function(
_membership_date,
string = 'Cancel membership date', type='date', multi='membership_cancel',
string = 'Cancel Membership Date', type='date', multi='membership_cancel',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 11),
'membership.membership_line': (_get_partner_id, ['state'], 10),

5
addons/plugin_outlook/plugin_outlook.xml
View File

@ -11,9 +11,6 @@
<form position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
</separator>
<xpath expr="//footer" position="replace"/>
<xpath expr="//separator[@string='title']" position="after" version="7.0">
<group>
@ -29,7 +26,7 @@
</ul>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute>
<attribute name="string"></attribute>
</separator>
</data>
</field>

5
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -11,9 +11,6 @@
<form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator>
<xpath expr="//footer" position="replace"/>
<xpath expr="//separator[@string='title']" position="after">
<group>
@ -35,7 +32,7 @@
</ul>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
<attribute name="string"></attribute>
</separator>
</data>
</field>

14
addons/product/product_view.xml
View File

@ -314,18 +314,18 @@
<form string="Product Categories" version="7.0">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<label for="name" class="oe_edit_only"/>
<field name="name"/>
</h1>
</div>
<group>
<group>
<field name="type"/>
</group>
<group>
<field name="parent_id"/>
</group>
<group>
<field name="parent_id"/>
</group>
<group>
<field name="type"/>
</group>
</group>
<group name="basic">
<group name="account_property" string="Account Properties"/>

40
addons/project/res_partner_view.xml
View File

@ -3,35 +3,29 @@
<data>
<!-- Partners inherited form -->
<record id="base.view_crm_partner_info_History" model="ir.ui.view">
<field name="name">res.partner.crm.history.inherit1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_task_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.task.info.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<field name="task_ids" colspan="4" nolabel="1">
<tree string="Tasks" editable="bottom">
<field name="name"/>
<field name="user_id"/>
<field name="date_deadline"/>
<field name="state" invisible="1"/>
<button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
</field>
</page>
<xpath expr="//page[@name='page_history']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
<group name="grp_task" string="Tasks">
<field name="task_ids" colspan="4" nolabel="1">
<tree string="Tasks" editable="bottom">
<field name="name"/>
<field name="user_id"/>
<field name="date_deadline"/>
<field name="state" invisible="1"/>
<button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
</field>
</group>
</xpath>
</field>
</record>

2
addons/project_timesheet/project_timesheet_view.xml
View File

@ -70,7 +70,7 @@
<field name="inherit_id" ref="account.view_account_analytic_line_form"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
<field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
<field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
</field>
</field>
</record>

5
addons/sale/sale_view.xml
View File

@ -174,7 +174,6 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
</group>
<group>
@ -263,6 +262,8 @@
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
</group>
<group name="sale_margin_grp">
</group>
<div class="oe_clear">
<label for="note"/>
</div>
@ -297,7 +298,7 @@
<tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
<field name="date_invoice"/>
<field name="number"/>
<field name="partner_id"/>
<field name="partner_id" string="Customer"/>
<field name="user_id"/>
<field name="date_due"/>
<field name="amount_total"/>

2
addons/sale/stock_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="auto_picking" position="after">
<field name="move_type" position="before">
<field name="sale_id"/>
</field>
</field>

9
addons/sale_margin/sale_margin_view.xml
View File

@ -8,8 +8,13 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='sale_total']" position="inside">
<field name="margin"/>
<xpath expr="//group[@name='sale_margin_grp']" position="inside">
<group>
<label for="margin"/>
<div>
<field name="margin"/>
</div>
</group>
</xpath>
</field>
</record>

2
addons/stock/stock_view.xml
View File

@ -860,7 +860,7 @@
</form>
</field>
</page>
<page string="Additional info">
<page string="Additional Info">
<group>
<group>
<field name="move_type"/>

2
addons/wiki/wiki_view.xml
View File

@ -155,7 +155,7 @@
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Meta Information"/>
<field name="tags"/>
<field name="tags" widget="many2many_tags"/>
<field name="toc" groups="base.group_no_one"/>
</group>
</sheet>

2
addons/wiki_sale_faq/wiki_sale_faq_view.xml
View File

@ -17,7 +17,7 @@
</record>
<record model="ir.actions.act_window" id="action_wiki_test">
<field name="name">Wiki Pages</field>
<field name="name">Sales FAQ</field>
<field name="res_model">wiki.wiki</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>