[MERGE]

bzr revid: hmo@tinyerp.com-20100428063021-z66ib99xgpu4nzpg

3 files changed, 12 insertions, 54 deletions

diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index a4c892340de..06c72022fe7 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -7,14 +7,14 @@
         <field name="code">shcal</field>
     </record>
 
-    <record model="document.directory" id="dir_calendars">
+    <record model="document.directory" id="document.dir_calendars">
         <field name="name">Calendars</field>
     </record>
 
     <record model="document.directory.content" id="dir_content_calendar">
         <field name="name">Calendars</field>
         <field name="suffix">meetings</field>
-        <field name="directory_id" ref="dir_calendars"/>
+        <field name="directory_id" ref="document.dir_calendars"/>
         <field name="extension">.ics</field>
         <field name="include_name" eval="False"/>
         <field name="object_id" ref="crm.model_crm_meeting"/>
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index 9056b3250b4..00f8927eb18 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -332,8 +332,8 @@ class document_directory_content(osv.osv):
         return s
 document_directory_content()
 
-class crm_case(osv.osv):
-    _inherit = 'crm.case'
+class crm_meeting(osv.osv):
+    _inherit = 'crm.meeting'
     _columns = {
         'code': fields.char('Calendar Code', size=64),
         'date_deadline': fields.datetime('Deadline', help="Deadline Date is automatically\
@@ -341,7 +341,7 @@ class crm_case(osv.osv):
     }
 
     _defaults = {
-        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'crm.case'),
+        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'crm.meeting'),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -356,32 +356,10 @@ class crm_case(osv.osv):
 
         if not default: default = {}
         if not context: context = {}
-        default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.case'), 'id': False})
-        return super(crm_case, self).copy(cr, uid, id, default, context)
+        default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.meeting'), 'id': False})
+        return super(crm_meeting, self).copy(cr, uid, id, default, context)  
 
-    def on_change_duration(self, cr, uid, id, date, duration):
-        """ Change Duration
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param id: crm case's ID,
-            @param date: Pass the Date,
-            @param duration: Pass the duration,
-        """
-
-        if not date:
-            return {}
-        start_date = datetime.datetime.fromtimestamp(time.mktime(time.strptime(date, "%Y-%m-%d %H:%M:%S")))
-        if duration >= 0 :
-            end = start_date + datetime.timedelta(hours=duration)
-        if duration < 0:
-            raise osv.except_osv(_('Warning !'),
-                    _('You can not set negative Duration.'))
-
-        res = {'value': {'date_deadline' : end.strftime('%Y-%m-%d %H:%M:%S')}}
-        return res
-
-crm_case()
+crm_meeting()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index ac99f3723db..0cbfb6f81e2 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -39,36 +39,16 @@
         </field>
     </record>
 
-	 <record model="ir.ui.view" id="view_case_inherit_form">
-        <field name="name">crm.case.code.form</field>
-        <field name="model">crm.case</field>
+	 <record model="ir.ui.view" id="view_meeting_inherit_form">
+        <field name="name">crm.meeting.code.form</field>
+        <field name="model">crm.meeting</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="crm.crm_case-view"/>
+        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
         <field name="arch" type="xml">
             <field name="priority" position="after">
                 <field name="code"/>
             </field>
         </field>
     </record>
-
-<!-- CRM Case Form View  -->
-
-    <record model="ir.ui.view" id="view_case_inherit_form1">
-        <field name="name">crm.case.inherit.form1</field>
-        <field name="model">crm.case</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="crm.crm_case-view"/>
-        <field name="arch" type="xml">
-            <field name="date" position="replace">
-           		<field name="date"
-           			on_change="on_change_duration(date, duration)"
-           			required="1" />
-           		<field name="duration" string="Duration(In Hour)"
-           			on_change="on_change_duration(date, duration)"
-           			widget="float_time" />
-            </field>
-        </field>
-    </record>
-
 </data>
 </openerp>