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

[MERGE] review of form views for crm, sale,... (part 1)

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120702170854-25c8vtgusprrz386
This commit is contained in:
Quentin (OpenERP)
2012-07-02 19:08:54 +02:00
parent 8e9f7b7739 b2a1eeecbe
commit 38d7e1298e
19 changed files with 192 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_installer.xml
+1 -2
View File
@@ -13,8 +13,7 @@
<attribute name="string">Continue</attribute>
</button>
<separator string="title" position="replace">
<group string="Select an Accounting Setup">
<label colspan="2" string="This will automatically configure your taxes and accounts."/>
<group>
<field name="charts"/>
</group>
<group string="Configure your Fiscal Year" groups="account.group_account_user">
addons/account/account_view.xml
+1 -2
View File
@@ -2357,12 +2357,11 @@
<group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company">
<label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div>
<group string="Set Your Accounting Options">
<group>
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
addons/base_calendar/base_calendar_view.xml
+2 -2
View File
@@ -45,10 +45,10 @@
</group>
</group>
<group>
<group string="Delegrated From">
<group string="Delegated From">
<field name="parent_ids" readonly="1" nolabel="1" />
</group>
<group string="Delegrated To" >
<group string="Delegated To" >
<field name="child_ids" readonly="1" nolabel="1" />
</group>
</group>
addons/caldav/wizard/caldav_browse_view.xml
+43 -18
View File
@@ -7,13 +7,36 @@
<field name="model">caldav.browse</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Browse Caldav" >
<group colspan="4" width="700" height="500">
<separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="4" />
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/>
</group>
<form string="Browse Caldav" version="7.0">
<header>
<button special="cancel" string="_Close" icon="gtk-close"/>
</header>
<sheet>
<group>
<separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="2" />
<separator string="Help" colspan="4"/>
<group colspan="4"><div>
1. Webdav server that provides remote access to calendar<br/>
2. Synchronisation of calendar using WebDAV<br/>
3. Customize calendar event and todo attribute with any of OpenERP model<br/>
4. Provides iCal Import/Export functionality
<br/></div></group>
<group colspan="4"><div>
To access Calendars using CalDAV clients, point them to:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/calendars/users/<i>USERNAME</i>/c</div></group>
<group colspan="4"><div>
To access OpenERP Calendar using WebCal to remote site use the URL like:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/Calendars/<i>CALENDAR_NAME</i>.ics</div></group>
<group colspan="4"><div>
<i>
HOSTNAME: Host on which OpenERP server(With webdav) is running<br/>
PORT : Port on which OpenERP server is running (By Default : 8069)<br/>
DATABASE_NAME: Name of database on which OpenERP Calendar is created</i>
</div></group>
</group>
</sheet>
</form>
</field>
</record>
@@ -29,12 +52,11 @@
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Configure your openerp hostname. For example : " colspan="4"></label>
<newline/>
<label string="database.my.openerp.com or companyserver.com" colspan="4"/>
<newline/>
<separator colspan="4"/>
<field name="host_name" colspan="4" width="250" />
<sheet>
<group>
<field name="host_name" colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
</group>
</sheet>
</form>
</field>
</record>
@@ -50,11 +72,14 @@
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="" colspan="4"/>
<field name="service" colspan="4" width="250" readonly="1"/>
<field name="collection" colspan="4" width="250" invisible="1" />
<field name="calendar" colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device" colspan="4" width="250" />
<sheet>
<group>
<field name="service" readonly="1"/>
<field name="collection" invisible="1" />
<field name="calendar" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device"/>
</group>
</sheet>
</form>
</field>
</record>
addons/crm/crm_meeting_view.xml
+19 -17
View File
@@ -84,24 +84,26 @@
<h1>
<field name="name"/>
</h1>
<h2>
At <field name="location" class="oe_inline" />
</h2>
</div>
<h2>
<label for="duration" string="Duration" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)"
class="oe_inline"/> from
<field name="date"
string="Start Date"
required="1"
class="oe_edit_only oe_inline"/> to
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_inline"/>
</h2>
<group>
<h2>
<label for="date" string="Starting at"/>
<field name="date" required="1" class="oe_inline"/>
<label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
</h2>
</group>
<group>
<h2>
<label for="duration" string="Duration" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)"
class="oe_inline"/> (
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_inline"/> )
</h2>
</group>
<group colspan="4" col="4">
<group colspan="2">
<field name="user_id" />
addons/crm/crm_view.xml
+9 -4
View File
@@ -81,11 +81,16 @@
<notebook colspan="4">
<page string="Sales Team">
<group col="4">
<field name="reply_to"/>
<field name="allow_unlink"/>
<field name="change_responsible"/>
<field name="member_ids"/>
<group>
<field name="reply_to"/>
</group>
<group>
<field name="change_responsible"/>
<field name="allow_unlink"/>
</group>
</group>
<separator string="Team Members"/>
<field name="member_ids"/>
</page>
<page string="Stages">
<separator string="Select Stages for this Sales Team"/>
addons/crm/res_partner_view.xml
+2 -3
View File
@@ -99,10 +99,9 @@
context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" />
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
<button type="action" string="Opportunities"
context="{'search_default_partner_id': [active_id]}"
name="%(crm.action_view_crm_partner2opportunity)d" />
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
</xpath>
</field>
</record>
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
-3
View File
@@ -17,15 +17,12 @@
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<separator string="Schedule/Log a Call" colspan="4"/>
<field name="action"/>
<separator string="Call Details" colspan="4"/>
<field name="name"/>
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
<field name="partner_id" readonly="True"/>
<field name="user_id" />
<field name="section_id"/>
<field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
</group>
</form>
</field>
addons/crm_caldav/crm_caldav_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<record id="action_caldav_browse" model="ir.actions.act_window">
<field name="name">Caldav Browse</field>
<field name="name">Synchronize Your Meetings</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">user.preference</field>
<field name="view_id" ref="caldav.host_prefernce_form"/>
addons/crm_fundraising/crm_fundraising_view.xml
+21 -11
View File
@@ -72,38 +72,48 @@
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet string="Funds Form">
<group col="4">
<field name="name" string="Name"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="user_id" string="Responsible"/>
<field name="date"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
<field name="type_id" string="Payment Mode" widget="selection"/>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<label for="categ_id" class="oe_edit_only"/>
<h2>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]" class="oe_inline"/>
</h2>
<group>
<group>
<field name="user_id" string="Responsible"/>
<field name="section_id" colspan="1" widget="selection"/>
</group>
<group>
<field name="date"/>
<field name="type_id" string="Payment Mode" widget="selection"/>
<field name="priority" string="Priority"/>
</group>
</group>
<notebook>
<page string="Funds">
<group>
<group string="Communication">
<group>
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)"
/>
<field name="email_from"/>
</group>
<group string="Estimates">
<group>
<field name="planned_cost"/>
<field name="planned_revenue"/>
<field name="probability"/>
</group>
</group>
<separator colspan="4" string="Notes"/>
<field name="description"/>
<field name="description" placeholder="Add a note..."/>
</page>
<page string="Extra Info">
<group>
<group string="Misc">
<field name="active"/>
<field name="id"/>
<field name="priority" string="Priority"/>
</group>
<group groups="base.group_no_one" string="Dates">
<field name="create_date"/>
addons/import_sugarcrm/import_sugarcrm.py
+1 -1
View File
@@ -949,7 +949,7 @@ class import_sugarcrm(osv.osv):
'user' : fields.boolean('User', help="Check this box to import sugarCRM Users into OpenERP users, warning if a user with the same login exist in OpenERP, user information will be erase by sugarCRM user information", readonly=True),
'opportunity': fields.boolean('Leads & Opp', help="Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads and Opportunities"),
'contact': fields.boolean('Contacts', help="Check this box to import sugarCRM Contacts into OpenERP addresses"),
'account': fields.boolean('Accounts', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
'account': fields.boolean('Partner/Account', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
'employee': fields.boolean('Employee', help="Check this box to import sugarCRM Employees into OpenERP employees"),
'meeting': fields.boolean('Meetings', help="Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"),
'call': fields.boolean('Calls', help="Check this box to import sugarCRM Calls into OpenERP calls"),
addons/import_sugarcrm/import_sugarcrm_view.xml
+48 -66
View File
@@ -9,76 +9,58 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Data From SugarCRM" version="7.0">
<header>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" class="oe_highlight" />
or
<button name="import_all" string="_Import" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8" >
<group colspan="2" col="2" width="200">
<label colspan="2" string="Import your data from SugarCRM :"/>
<label colspan="2" string="" />
<label colspan="2" string="Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."/>
<label colspan="2" string="" />
<label colspan="2" string="Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."/>
<label colspan="2" string="" />
<label colspan="2" string="If you make recurrent or ponctual import, data already in OpenERP will be updated by SugarCRM data."/>
<label colspan="2" string="" />
<label colspan="2" string="Do not forget the email address to be notified of the success of the import."/>
<label colspan="2" />
<label colspan="2" string="Online documentation:"/>
<label colspan="2" string="(Coming Soon)"/>
<label colspan="2" string=""/>
</group>
<separator string="" orientation="vertical" colspan="1" rowspan="24" />
<group colspan="5">
<separator string="Login Information" colspan="4"/>
<field name="url" colspan="4" widget="url"/>
<field name="username" colspan="4"/>
<field name="password" password="True" colspan="4"/>
<header>
<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" />
<button special="cancel" string="_Cancel" class="oe_link"/>
</header>
<sheet>
<group col="8" >
<group colspan="5">
<separator string="Login Information" colspan="4"/>
<field name="url" colspan="2" widget="url"/>
<field name="username" colspan="2"/>
<field name="password" password="True" colspan="2"/>
<group colspan="4">
<group colspan="1" col="2">
<separator string="Address Book" colspan="2"/>
<field name="user" />
<field name= "account" />
<field name= "contact" />
</group>
<group colspan="1" col="2">
<separator string="CRM" colspan="2"/>
<field name="opportunity" />
<field name= "call" />
<field name= "meeting" />
<field name= "claim" />
</group>
<group colspan="1" col="2">
<separator string="Project" colspan="2"/>
<field name= "project" />
<field name= "project_task" />
<field name= "bug"/>
</group>
<group colspan="1" col="2">
<separator string="HR" colspan="2"/>
<field name="employee" />
<separator string="Document" colspan="2"/>
<field name="email_history"/>
<field name= "document" />
<group colspan="4">
<separator string="Data to Import" colspan="4"/>
<group colspan="1" col="2">
<field name="user" />
<field name= "account" />
<field name= "contact" />
</group>
<group colspan="1" col="2">
<field name="opportunity" />
<field name= "call" />
<field name= "meeting" />
<field name= "claim" />
</group>
<group colspan="1" col="2">
<field name= "project" />
<field name= "project_task" />
<field name= "bug"/>
</group>
<group colspan="1" col="2">
<field name="employee" />
<field name="email_history"/>
<field name= "document" />
</group>
</group>
<group colspan="4">
<separator string="Email Notification When Import is Finished" colspan="2"/>
<field name="email_from" widget="email" string="Email Address to Notify" colspan="2"/>
</group>
<group colspan="4" groups="base.group_no_one">
<separator string="Multi Instance Management" colspan="4"/>
<field name="instance_name" colspan="2"/>
</group>
</group>
<group colspan="4">
<separator string="Email Notification When Import is Finished" colspan="4"/>
<field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/>
</group>
<group colspan="4" groups="base.group_no_one">
<separator string="Multi Instance Management" colspan="4"/>
<field name="instance_name" colspan="4"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>
addons/membership/membership.py
+1 -1
View File
@@ -141,7 +141,7 @@ class membership_line(osv.osv):
_name = 'membership.membership_line'
_columns = {
'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
'membership_id': fields.many2one('product.product', string="Membership Product", required=True),
'membership_id': fields.many2one('product.product', string="Membership", required=True),
'date_from': fields.date('From', readonly=True),
'date_to': fields.date('To', readonly=True),
'date_cancel': fields.date('Cancel date'),
addons/membership/membership_view.xml
+6 -3
View File
@@ -241,8 +241,11 @@
<group>
<group>
<field name="free_member"/>
<field colspan="4" name="membership_state"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
<label for="membership_state"/>
<div>
<field name="membership_state" class="oe_inline"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
</div>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
@@ -254,7 +257,7 @@
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<tree string="Memberships">
<field name="date"/>
<field name="membership_id" string="Membership"/>
<field name="membership_id"/>
<field name="member_price"/>
<field name="account_invoice_id"/>
<field name="state"/>
addons/product/product_view.xml
+2 -2
View File
@@ -423,12 +423,12 @@
<field name="arch" type="xml">
<form string="Units of Measure" version="7.0">
<group>
<group string="Unit of Measure Properties">
<group>
<field name="name"/>
<field name="category_id"/>
<field name="active"/>
</group>
<group string="Ratio &amp; Precision">
<group>
<field name="uom_type" on_change="onchange_type(uom_type)"/>
<field name="rounding"/>
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
addons/project_long_term/project_long_term_view.xml
+16 -16
View File
@@ -152,23 +152,23 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_edit_only"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_edit_only"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
</div>
<group>
<group>
<field name="date_start"/>
<field name="date_end"/>
</group><group>
<label for="duration"/>
<div>
<field name="duration" class="oe_inline"/>
<field name="product_uom"/>
</div>
</group>
<label for="date_start" string="Duration"/>
<div>
<div>
<field name="duration" class="oe_inline"/>
<field name="product_uom" class="oe_inline"/>
</div>
<field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
</div>
</group>
<notebook>
<page string="Planning of Users">
addons/sale/sale_view.xml
+5 -4
View File
@@ -12,15 +12,16 @@
<form string="Sales Shop" version="7.0">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="warehouse_id" class="oe_edit_only"/>
<h2><field name="warehouse_id" required="1"/></h2>
<group>
<group>
<field name="warehouse_id" required="1" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="payment_default_id"/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
</group>
<group>
<field name="project_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
</form>
addons/stock/stock_view.xml
+1 -1
View File
@@ -790,7 +790,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<field name="state" widget="statusbar" status_visible="draft,assigned,done" />
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
</header>
<group>
<group string="Move Information">
addons/wiki/wiki_view.xml
+13 -7
View File
@@ -129,16 +129,22 @@
<field name="arch" type="xml">
<form string="Wiki" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name" colspan="6"/>
<field name="group_id" string="Topic" on_change="onchange_group_id(group_id, text_area)"/>
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
<field name="section"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name" select="1" /></h1>
<label for="group_id" class="oe_edit_only"/>
<h2>
<field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
</div>
<group>
<group>
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
<field name="section"/>
</group>
</group>
<notebook colspan="4">
<page string="Content">
<separator colspan="4" string="Page Content"/>
<field name="text_area" nolabel="1" colspan="4" widget="text_wiki"/>
<field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
</page>
</notebook>
<group col="2" colspan="2" groups="base.group_no_one">