From 09b4e880766977c168707e1e39a62920966ad894 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 25 Jan 2010 12:49:49 +0530
Subject: [PATCH 1/3] [IMP]:survey,crm_hr *Improved the demo data in crm_hr
 *improved the date format in survey browse report.

bzr revid: apa@tinyerp.com-20100125071949-de0xrrcyuhi8kv11
---
 addons/crm_hr/crm_hr_data.xml                  | 3 ++-
 addons/survey/report/survey_browse_response.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml
index 8d8f6c2ee94..337e9f3af24 100644
--- a/addons/crm_hr/crm_hr_data.xml
+++ b/addons/crm_hr/crm_hr_data.xml
@@ -80,6 +80,7 @@
 		<record id="survey_job_0" model="survey">
 			<field name="title">Job Survey</field>
 			<field name="state">draft</field>
+			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
@@ -92,7 +93,7 @@
 	</data>
 	<data>
 		<record id="survey_page_job_1" model="survey.page">
-			<field name="title">Education &amp;amp; Activities</field>
+			<field name="title">Education &amp; Activities</field>
 			<field name="survey_id" ref="survey_job_0"/>
 			<field eval="2" name="sequence"/>
 		</record>
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 2d1d94c4b4e..93b9ec011f6 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -24,6 +24,7 @@ import pooler
 from report.interface import report_rml
 from tools import to_xml
 import tools
+import time
 
 class survey_browse_response(report_rml):
     def create(self, cr, uid, ids, datas, context):
@@ -162,7 +163,7 @@ class survey_browse_response(report_rml):
                                   <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
                                 </td>
                                 <td>
-                                  <para style="terp_default_Centre_8">""" + to_xml(response.date_create) + """</para>
+                                  <para style="terp_default_Centre_8">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para>
                                 </td>
                                 <td>
                                   <para style="terp_default_Centre_8">""" + to_xml(response.user_id.name) + """</para>

From c1aa3918fa433a80f9cfdf02bbdc8e4177e3c2dc Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 14:51:28 +0530
Subject: [PATCH 2/3] [FIX] document_change: correct domain in relate button
 link

bzr revid: hmo@tinyerp.com-20100125092128-q6x20weryvpm6jql
---
 addons/document_change/document_change_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 8bac532111a..8ad39632ce1 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -445,7 +445,7 @@
     </record>	
 	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
+	<act_window domain="[('process_phase_id', '=', active_id)]" 
 		id="act_documents_phases" 
 		name="Documents" 
 		res_model="ir.attachment" 
@@ -462,13 +462,13 @@
             <form string="Process Change">
             	<group colspan="4">
 	                <field name="name"/>	                
-	                <field name="structure_id" select="1"/>
-                    <field name="description" colspan="4"/>	                
+	                <field name="structure_id" select="1"/>                                    
                     <group colspan="4" col="7">
                         <field name="process_type_id" widget="selection"/>	                
     	                <field name="process_model_id" widget="selection"/>
                         <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
                     </group>	                
+                    <field name="description" colspan="4"/>	
 	            </group>
                 <notebook colspan="4">
                 	<page string="Process Definition">
@@ -593,13 +593,13 @@
     </record>	
 	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('phase_ids', '=', active_id)]" 
+	<act_window domain="[('process_id', '=', active_id)]" 
 		id="act_phase_change_process" 
 		name="Phases" 
 		res_model="document.change.process.phase" 
 		src_model="document.change.process"/>
 	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
+	<act_window domain="[('change_process_id', '=', active_id)]" 
 		id="act_documents_change_process" 
 		name="Documents" 
 		res_model="ir.attachment" 

From 0aa3823dea0c1d54d12a13d6a62996fefa8cd827 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 15:44:42 +0530
Subject: [PATCH 3/3] [IMP] document_change: add pending_dir n process

bzr revid: hmo@tinyerp.com-20100125101442-0dxxo7msj4m94d5u
---
 addons/document_change/document_change.py     |  3 ++-
 .../document_change/document_change_view.xml  | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 4968b0a124d..09f7017ea2c 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -144,7 +144,7 @@ class doucment_change_process(osv.osv):
         'process_type_id' :fields.many2one('document.change.process.type','Type Change'),
         'description': fields.char("Small Description", size=64),
         'change_description':fields.text('Changed Description'),
-        'structure_id' :fields.many2one('document.directory','Structure ID'),
+        'structure_id' :fields.many2one('document.directory','Structure Directory'),
         'process_model_id':fields.many2one('document.change.process.model','Process Model'),
         'user_id':fields.many2one('res.users','Change Owner'),
         'create_date':fields.datetime('Creation',readonly=True),
@@ -156,6 +156,7 @@ class doucment_change_process(osv.osv):
         'progress': fields.float('Progress'), #TODO : functio field: calculate progress
         'current_phase_id': fields.many2one('document.change.process.phase','Current Phase'), # TODO: function field. find out in process phase 
         'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
+        'pending_directory_id' :fields.many2one('document.directory','Pending Directory'),
     }
     _defaults = {      
       'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'document.change.process'),
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 8ad39632ce1..a1f184c88d9 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -459,17 +459,21 @@
         <field name="model">document.change.process</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Change">
-            	<group colspan="4">
-	                <field name="name"/>	                
-	                <field name="structure_id" select="1"/>                                    
-                    <group colspan="4" col="7">
-                        <field name="process_type_id" widget="selection"/>	                
-    	                <field name="process_model_id" widget="selection"/>
-                        <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
-                    </group>	                
-                    <field name="description" colspan="4"/>	
-	            </group>
+            <form string="Process Change">            	
+                <group colspan="4" col="6">
+                    <field name="name"/>	                
+                    <field name="structure_id"/> 
+                    <field name="pending_directory_id"/>    
+                </group>                              
+                <group colspan="4" col="5">
+                    <field name="process_type_id" widget="selection"/>	                
+                    <field name="process_model_id" widget="selection"/>
+                    <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
+                </group>
+                <group colspan="4">                                    
+                    <field name="description" colspan="4"/>
+                </group>
+
                 <notebook colspan="4">
                 	<page string="Process Definition">
                 		<group col="2" colspan="2">