[IMP] change caldav view

bzr revid: kjo@tinyerp.com-20120629134822-c9cg6sz6vwt35648
This commit is contained in:
Kuldeep Joshi (OpenERP) 2012-06-29 19:18:22 +05:30
parent 2cbeac1824
commit bc42c6e49e
5 changed files with 27 additions and 21 deletions

View File

@ -2359,12 +2359,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)]"/>

View File

@ -12,23 +12,29 @@
<button special="cancel" string="_Close" icon="gtk-close"/>
</header>
<sheet>
<group colspan="4" width="700" height="500">
<group>
<separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="2" />
<separator string="Help" colspan="4"/>
<label string=" * Webdav server that provides remote access to calendar" colspan="4"/>
<label string=" * Synchronisation of calendar using WebDAV" colspan="4"/>
<label string=" * Customize calendar event and todo attribute with any of OpenERP model" colspan="4"/>
<label string=" * Provides iCal Import/Export functionality" colspan="4"/>
<label string=" To access Calendars using CalDAV clients, point them to:
http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c" colspan="4"/>
<label string=" To access OpenERP Calendar using WebCal to remote site use the URL like:
http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics" colspan="4"/>
<label string=" Where,
HOSTNAME: Host on which OpenERP server(With webdav) is running
PORT : Port on which OpenERP server is running (By Default : 8069)
DATABASE_NAME: Name of database on which OpenERP Calendar is created" colspan="4"/>
<separator 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>

View File

@ -14,6 +14,7 @@
type="object" icon="terp-camera_test"/>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
type="object" icon="gtk-execute" />
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
</header>
<sheet>
<group col="8" >

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'),

View File

@ -239,10 +239,10 @@
<notebook position="inside">
<page string="Membership">
<group>
<group>
<group col="3">
<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"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}"/>
<field name="membership_state"/>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
@ -254,7 +254,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"/>