diff --git a/addons/association/__terp__.py b/addons/association/__openerp__.py
similarity index 100%
rename from addons/association/__terp__.py
rename to addons/association/__openerp__.py
diff --git a/addons/auction/__terp__.py b/addons/auction/__openerp__.py
similarity index 100%
rename from addons/auction/__terp__.py
rename to addons/auction/__openerp__.py
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__openerp__.py
similarity index 100%
rename from addons/audittrail/__terp__.py
rename to addons/audittrail/__openerp__.py
diff --git a/addons/base_action_rule/__terp__.py b/addons/base_action_rule/__openerp__.py
similarity index 100%
rename from addons/base_action_rule/__terp__.py
rename to addons/base_action_rule/__openerp__.py
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__openerp__.py
similarity index 100%
rename from addons/base_contact/__terp__.py
rename to addons/base_contact/__openerp__.py
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__openerp__.py
similarity index 100%
rename from addons/base_iban/__terp__.py
rename to addons/base_iban/__openerp__.py
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__openerp__.py
similarity index 100%
rename from addons/base_module_quality/__terp__.py
rename to addons/base_module_quality/__openerp__.py
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__openerp__.py
similarity index 100%
rename from addons/base_module_record/__terp__.py
rename to addons/base_module_record/__openerp__.py
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__openerp__.py
similarity index 100%
rename from addons/base_report_creator/__terp__.py
rename to addons/base_report_creator/__openerp__.py
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__openerp__.py
similarity index 100%
rename from addons/base_report_designer/__terp__.py
rename to addons/base_report_designer/__openerp__.py
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__openerp__.py
similarity index 100%
rename from addons/base_setup/__terp__.py
rename to addons/base_setup/__openerp__.py
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__openerp__.py
similarity index 100%
rename from addons/base_vat/__terp__.py
rename to addons/base_vat/__openerp__.py
diff --git a/addons/board/__terp__.py b/addons/board/__openerp__.py
similarity index 100%
rename from addons/board/__terp__.py
rename to addons/board/__openerp__.py
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__openerp__.py
similarity index 100%
rename from addons/board_account/__terp__.py
rename to addons/board_account/__openerp__.py
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__openerp__.py
similarity index 100%
rename from addons/board_association/__terp__.py
rename to addons/board_association/__openerp__.py
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__openerp__.py
similarity index 100%
rename from addons/board_auction/__terp__.py
rename to addons/board_auction/__openerp__.py
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__openerp__.py
similarity index 100%
rename from addons/board_hr/__terp__.py
rename to addons/board_hr/__openerp__.py
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__openerp__.py
similarity index 100%
rename from addons/board_manufacturing/__terp__.py
rename to addons/board_manufacturing/__openerp__.py
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__openerp__.py
similarity index 100%
rename from addons/board_project/__terp__.py
rename to addons/board_project/__openerp__.py
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__openerp__.py
similarity index 100%
rename from addons/board_sale/__terp__.py
rename to addons/board_sale/__openerp__.py
diff --git a/addons/board_warehouse/__terp__.py b/addons/board_warehouse/__openerp__.py
similarity index 100%
rename from addons/board_warehouse/__terp__.py
rename to addons/board_warehouse/__openerp__.py
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index f84d5bd5b69..b3e45a33978 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -44,21 +44,24 @@ The CRM module has a email gateway for the synchronisation interface
 between mails and Open ERP.""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'base_action_rule',
-                        'process',
-                        'mail_gateway',
-                        'base_calendar',
-                        'resource',
-                    ],
-    'init_xml': ['crm_data.xml',
-                'crm_meeting_data.xml',
-                 'crm_claims_data.xml',
-                 'crm_fund_data.xml',
-                 'crm_helpdesk_data.xml',
-                 'crm_lead_data.xml',
-                 'crm_meeting_data.xml',
-                 'crm_opportunity_data.xml',
-                 'crm_phonecall_data.xml',
+    'depends': [
+        'base', 
+        'base_action_rule',
+        'process',
+        'mail_gateway',
+        'base_calendar',
+        'resource',
+    ],
+    'init_xml': [
+        'crm_data.xml',
+        'crm_meeting_data.xml',
+         'crm_claims_data.xml',
+         'crm_fund_data.xml',
+         'crm_helpdesk_data.xml',
+         'crm_lead_data.xml',
+         'crm_meeting_data.xml',
+         'crm_opportunity_data.xml',
+         'crm_phonecall_data.xml',
     ],
 
     'update_xml': [
@@ -104,7 +107,6 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-
     ],
     'demo_xml': [
         'crm_demo.xml',
@@ -114,7 +116,8 @@ between mails and Open ERP.""",
         'crm_lead_demo.xml',
         'crm_meeting_demo.xml',
         'crm_opportunity_demo.xml',
-        'crm_phonecall_demo.xml'],
+        'crm_phonecall_demo.xml'
+    ],
     'installable': True,
     'active': False,
     'certificate': '0079056041421',
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 5b83b3802a6..a2a104adf15 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -129,7 +129,7 @@
                         <field name="date"/>
                         <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index bf430eafc08..dc11b071a4c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -58,7 +58,7 @@
                                 icon="gtk-go-forward" />
                         </group>
 
-                        <separator colspan="4" string="Details"/>
+                        <separator colspan="4" string="Notes"/>
                         <field name="description" colspan="4"
                                 nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3cb55bf1ebf..546431ac7c7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -57,8 +57,8 @@ class crm_lead(osv.osv):
         @param context: A standard dictionary for contextual values
         """        
         cal_obj = self.pool.get('resource.calendar') 
-        res_obj = self.pool.get('resource.resource')   
-          
+        res_obj = self.pool.get('resource.resource')     
+
         res = {}
         for lead in self.browse(cr, uid, ids , context):
             for field in fields:
@@ -81,8 +81,8 @@ class crm_lead(osv.osv):
                     resource_id = False
                     if lead.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',lead.user_id.id)])
-                        if resource_ids:
-                            resource_id = len(resource_ids) or resource_ids[0]
+                        if len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if lead.section_id.resource_calendar_id:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a54cf7c1621..829372fb30b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -168,9 +168,9 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Email"
+                                string="Reply to Last Email"
                                 name="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                 icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 6c687a2d49e..3e1fc24a803 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -88,8 +88,8 @@ class crm_opportunity(osv.osv):
                     resource_id = False
                     if opportunity.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
-                        if resource_ids:
-                            resource_id = len(resource_ids) or resource_ids[0]
+                        if resource_ids and len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if opportunity.section_id.resource_calendar_id:
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 58d69699404..30c1ab2135c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,16 +10,16 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads">
-				<field name="name" />
-				<field name="month"/>
-				<field name="section_id" />
-				<field name="user_id" />
-    			<field name="company_id" />
-				<field name="partner_id" />
-				<field name="nbr" string="#Leads"/>
+                <field name="name" />
+                <field name="month"/>
+                <field name="section_id" />
+                <field name="user_id" />
+                <field name="company_id" />
+                <field name="partner_id" />
+                <field name="nbr" string="#Leads"/>
                 <field name="delay_close"/>
                 <field name="state"  invisible="1"/>
-				<field name="stage_id"  invisible="1"/>
+                <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
              </tree>
             </field>
@@ -34,8 +34,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
-                	<field name="stage_id"/>
+                    <field name="delay_close"/>
+                    <field name="stage_id"/>
                 </field>
             </field>
         </record>
@@ -63,12 +63,12 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-			<xpath
-				expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-				position='after'>
-				<filter string="Stage" icon="terp-sale" domain="[]"
-					context="{'group_by':'stage_id'}" />
-			</xpath>
+            <xpath
+                expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                position='after'>
+                <filter string="Stage" icon="terp-sale" domain="[]"
+                    context="{'group_by':'stage_id'}" />
+            </xpath>
             </field>
         </record>
 
@@ -84,22 +84,23 @@
 
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_lead_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_lead_tree"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_lead_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_graph"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<menuitem name="Leads" id="menu_report_crm_leads_tree"
-       		parent="base.next_id_64" action="action_report_crm_lead" />
+       <menuitem name="Leads" id="menu_report_crm_leads_tree"
+           groups="base.group_extended"
+           parent="base.next_id_64" action="action_report_crm_lead" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a78d94977f8..e937ef6bd22 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,17 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Phone calls">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
                     <field name="partner_id" />
-					<field name="nbr" string="#Phone calls" />
-	                <field name="delay_close"/>
+                    <field name="nbr" string="#Phone calls" />
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
-				</tree>
+                </tree>
             </field>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -81,23 +81,24 @@
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_phonecall_tree"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_phonecall_graph"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <menuitem name="Phone Calls"
-        	action="action_report_crm_phonecall"
-        	id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+            action="action_report_crm_phonecall"
+            groups="base.group_extended"
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index fd52f152c81..08ee332d8d7 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -182,6 +182,8 @@ class crm_send_new_email(osv.osv_memory):
         """
         hist_obj = self.pool.get('crm.case.history')
         res_ids = context and context.get('active_ids', []) or []
+
+        include_original = context and context.get('include_original', False) or False
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids):
             model = hist.log_id.model_id.model
@@ -193,7 +195,8 @@ class crm_send_new_email(osv.osv_memory):
                 res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
-            if 'text' in fields:
+
+            if include_original == True and 'text' in fields:
                 header = '-------- Original Message --------'
                 sender = 'From: %s' %(hist.email_from or '')
                 to = 'To: %s' % (hist.email_to or '')
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 92924a80d7a..0bfb48e328a 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -21,25 +21,25 @@
 
 
 {
-    'name': 'Extened Module to Add CalDAV feature on Meeting', 
-    'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'name': 'Extened Module to Add CalDav future on Meeting',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
     'description': """
-    New Features in Meeting:
-        * Meeting synchronization using Caldav
-        * Share Meeting with other Calendar clients like Sunbird
+    New Futures in Meeting:        
+        *  Share meeting with other calendar clients like sunbird         
 """, 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
-    'depends': ['caldav', 'crm'], 
+    'depends': ['caldav', 'crm'
+                    ], 
     'init_xml': [ 
-                'crm_caldav_data.xml', 
+                'crm_caldav_data.xml',                 
     ], 
 
-    'update_xml': [], 
+    'update_xml': [],
     'demo_xml': [], 
     'installable': True, 
-    'active': False, 
+    'active': False,     
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/decimal_precision/__terp__.py b/addons/decimal_precision/__openerp__.py
similarity index 100%
rename from addons/decimal_precision/__terp__.py
rename to addons/decimal_precision/__openerp__.py
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__openerp__.py
similarity index 100%
rename from addons/delivery/__terp__.py
rename to addons/delivery/__openerp__.py
diff --git a/addons/fetchmail/__terp__.py b/addons/fetchmail/__openerp__.py
similarity index 100%
rename from addons/fetchmail/__terp__.py
rename to addons/fetchmail/__openerp__.py
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__openerp__.py
similarity index 100%
rename from addons/google_map/__terp__.py
rename to addons/google_map/__openerp__.py
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index a32e3027bba..244668ec719 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -19,11 +19,10 @@
 		 action="holidays_summary"
 		 type="wizard"
 		 id="menu_holidays_summary" sequence="20"/>
--->
-	 <!-- restrict menu access to HR Manager -->
 	 <record model='ir.ui.menu' id="menu_holidays_summary">
 		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
   	 </record>
+-->
 
 	<!--<wizard string="Employee's Holidays"
 		model="hr.employee" name="hr.holidays.summary.employee"
diff --git a/addons/html_view/__terp__.py b/addons/html_view/__openerp__.py
similarity index 100%
rename from addons/html_view/__terp__.py
rename to addons/html_view/__openerp__.py
diff --git a/addons/idea/__terp__.py b/addons/idea/__openerp__.py
similarity index 100%
rename from addons/idea/__terp__.py
rename to addons/idea/__openerp__.py
diff --git a/addons/knowledge/__terp__.py b/addons/knowledge/__openerp__.py
similarity index 100%
rename from addons/knowledge/__terp__.py
rename to addons/knowledge/__openerp__.py
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__openerp__.py
similarity index 100%
rename from addons/l10n_be/__terp__.py
rename to addons/l10n_be/__openerp__.py
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__openerp__.py
similarity index 100%
rename from addons/l10n_ch/__terp__.py
rename to addons/l10n_ch/__openerp__.py
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__openerp__.py
similarity index 100%
rename from addons/l10n_ch_chart_c2c_pcg/__terp__.py
rename to addons/l10n_ch_chart_c2c_pcg/__openerp__.py
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__openerp__.py
similarity index 100%
rename from addons/l10n_chart_uk_minimal/__terp__.py
rename to addons/l10n_chart_uk_minimal/__openerp__.py
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__openerp__.py
similarity index 100%
rename from addons/l10n_fr/__terp__.py
rename to addons/l10n_fr/__openerp__.py
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__openerp__.py
similarity index 100%
rename from addons/l10n_lu/__terp__.py
rename to addons/l10n_lu/__openerp__.py
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__openerp__.py
similarity index 100%
rename from addons/lunch/__terp__.py
rename to addons/lunch/__openerp__.py
diff --git a/addons/mail_gateway/__terp__.py b/addons/mail_gateway/__openerp__.py
similarity index 100%
rename from addons/mail_gateway/__terp__.py
rename to addons/mail_gateway/__openerp__.py
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__openerp__.py
similarity index 100%
rename from addons/mrp/__terp__.py
rename to addons/mrp/__openerp__.py
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__openerp__.py
similarity index 100%
rename from addons/mrp_jit/__terp__.py
rename to addons/mrp_jit/__openerp__.py
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__openerp__.py
similarity index 100%
rename from addons/mrp_operations/__terp__.py
rename to addons/mrp_operations/__openerp__.py
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__openerp__.py
similarity index 100%
rename from addons/mrp_repair/__terp__.py
rename to addons/mrp_repair/__openerp__.py
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__openerp__.py
similarity index 100%
rename from addons/mrp_subproduct/__terp__.py
rename to addons/mrp_subproduct/__openerp__.py
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__openerp__.py
similarity index 100%
rename from addons/multi_company/__terp__.py
rename to addons/multi_company/__openerp__.py
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__openerp__.py
similarity index 100%
rename from addons/point_of_sale/__terp__.py
rename to addons/point_of_sale/__openerp__.py
diff --git a/addons/process/__terp__.py b/addons/process/__openerp__.py
similarity index 100%
rename from addons/process/__terp__.py
rename to addons/process/__openerp__.py
diff --git a/addons/product/__terp__.py b/addons/product/__openerp__.py
similarity index 100%
rename from addons/product/__terp__.py
rename to addons/product/__openerp__.py
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__openerp__.py
similarity index 100%
rename from addons/product_margin/__terp__.py
rename to addons/product_margin/__openerp__.py
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__openerp__.py
similarity index 100%
rename from addons/profile_accounting/__terp__.py
rename to addons/profile_accounting/__openerp__.py
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__openerp__.py
similarity index 100%
rename from addons/profile_manufacturing/__terp__.py
rename to addons/profile_manufacturing/__openerp__.py
diff --git a/addons/profile_tools/__terp__.py b/addons/profile_tools/__openerp__.py
similarity index 100%
rename from addons/profile_tools/__terp__.py
rename to addons/profile_tools/__openerp__.py
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 1ac69933623..b3e0be57cad 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -28,8 +28,7 @@
     "depends" : ["project", "caldav", "base_calendar"],
     "init_xml" : ["project_caldav_data.xml"],
     "demo_xml" : [],
-    "update_xml" : ["project_caldav_view.xml",
-                                "project_caldav_wizard.xml"],
+    "update_xml" : ["project_caldav_view.xml"],
     "active": False,
     "website": "http://www.openerp.com",
     "installable": True,
diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
new file mode 100755
index 00000000000..c51b756f4ca
--- /dev/null
+++ b/addons/project_issue/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import project_issue
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
new file mode 100755
index 00000000000..2bf67d47191
--- /dev/null
+++ b/addons/project_issue/__openerp__.py
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Issue Management in Project Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+        This module provide Issues/Bugs Management in Project
+    """,
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': [
+        'crm',
+        'project',
+        'hr_timesheet_sheet',
+    ],
+    'init_xml': [
+        'project_issue_data.xml'
+    ],
+    'update_xml': [
+        'project_issue_view.xml',
+        'project_issue_menu.xml',
+        'report/project_issue_report_view.xml',
+        'security/project_issue_security.xml',
+        'security/ir.model.access.csv',
+     ],
+    'demo_xml': ['project_issue_demo.xml'],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
new file mode 100755
index 00000000000..3f35913ae75
--- /dev/null
+++ b/addons/project_issue/project_issue.py
@@ -0,0 +1,243 @@
+ #-*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import base64
+import os
+import re
+import time
+import mx.DateTime
+from datetime import datetime, timedelta
+
+import tools
+from crm import crm
+from osv import fields,osv,orm
+from osv.orm import except_orm
+from tools.translate import _
+
+class project_issue(osv.osv):
+    _name = "project.issue"
+    _description = "Project Issue"
+    _order = "priority, id desc"
+    _inherit = 'crm.case'
+
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @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 ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        res = super(project_issue, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
+
+    def _compute_day(self, cr, uid, ids, fields, args, context={}):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
+        cal_obj = self.pool.get('resource.calendar')
+        res_obj = self.pool.get('resource.resource')
+
+        res = {}
+        for issue in self.browse(cr, uid, ids , context):
+            for field in fields:
+                res[issue.id] = {}
+                duration = 0
+                ans = False
+                if field == 'day_open':
+                    if issue.date_open:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
+                        ans = date_open - date_create
+                        date_until = issue.date_open
+                elif field == 'day_close':
+                    if issue.date_closed:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
+                        date_until = issue.date_closed
+                        ans = date_close - date_create
+                if ans:
+                    resource_id = False
+                    if issue.user_id:
+                        resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
+                        resource_id = len(resource_ids) or resource_ids[0]
+
+                    duration = float(ans.days)
+                    if issue.section_id.resource_calendar_id:
+                        duration =  float(ans.days) * 24
+                        new_dates = cal_obj.interval_get(cr,
+                            uid,
+                            issue.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
+                            mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+                            duration,
+                            resource=resource_id
+                        )
+                        no_days = []
+                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+                        for in_time, out_time in new_dates:
+                            if in_time.date not in no_days:
+                                no_days.append(in_time.date)
+                            if out_time > date_until:
+                                break
+                        duration =  len(no_days)
+                res[issue.id][field] = abs(int(duration))
+        return res
+
+    _columns = {
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date': fields.datetime('Date'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'duration': fields.float('Duration'),
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'date_open': fields.datetime('Opened', readonly=True),
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="integer", store=True),
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="integer", store=True),
+        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
+                                                domain="[('partner_id', '=', partner_id)]",
+                                                required=True),
+    }
+
+    def _get_project(self, cr, uid, context):
+       user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
+       if user.context_project_id:
+           return user.context_project_id
+       return False
+
+    def convert_issue_task(self, cr, uid, ids, context=None):
+        case_obj = self.pool.get('project.issue')
+        data_obj = self.pool.get('ir.model.data')
+        task_obj = self.pool.get('project.task')
+
+        if context is None:
+            context = {}
+
+#        for case in case_obj.browse(cr, uid, ids, context=context):
+#            if case.state != 'open':
+#                raise osv.except_osv(_('Warning !'),
+#                    _('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
+
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for bug in case_obj.browse(cr, uid, ids, context=context):
+            new_task_id = task_obj.create(cr, uid, {
+                'name': bug.name,
+                'partner_id': bug.partner_id.id,
+                'description':bug.description,
+                'date': bug.date,
+                'project_id':bug.project_id.id,
+                'priority':bug.priority,
+                'user_id':bug.user_id.id,
+                'planned_hours': 0.0,
+            })
+
+            new_task = task_obj.browse(cr, uid, new_task_id)
+
+            vals = {
+                'task_id': new_task_id,
+                }
+            case_obj.write(cr, uid, [bug.id], vals)
+
+        return  {
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'],
+            'nodestroy': True
+        }
+
+    def _convert(self, cr, uid, ids, xml_id, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
+        categ_id = False
+        if id2:
+            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
+        if categ_id:
+            self.write(cr, uid, ids, {'categ_id': categ_id})
+        return True
+
+    def convert_to_feature(self, cr, uid, ids, context=None):
+        return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
+
+    def convert_to_bug(self, cr, uid, ids, context=None):
+        return self._convert(cr, uid, ids, 'bug_categ', context=context)
+
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+        if not stage_id:
+            return {'value':{}}
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        if not stage.on_change:
+            return {'value':{}}
+        return {'value':{}}
+
+    _defaults = {
+        'project_id':_get_project,
+    }
+
+project_issue()
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _columns = {
+        'create_date' : fields.datetime('Create Date', readonly=True),
+    }
+
+account_analytic_line()
+
+class hr_analytic_issue(osv.osv):
+    _inherit = 'hr.analytic.timesheet'
+
+    _columns = {
+        'issue_id' : fields.many2one('project.issue', 'Issue'),
+    }
+
+hr_analytic_issue()
+
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
new file mode 100755
index 00000000000..a87039274f3
--- /dev/null
+++ b/addons/project_issue/project_issue_data.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+    <!--
+    Case Categories
+    -->
+         <!--    For Bugs    -->
+         
+    <record model="crm.case.categ" id="bug_categ">
+        <field name="name">Bugs</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.categ" id="feature_request_categ">
+        <field name="name">Feature Requests</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>
+
+    <!--
+    Case type_id
+    -->
+         <!--    For Bugs    -->
+    <record model="crm.case.resource.type" id="type1">
+        <field name="name">Version 4.2</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>    
+    <record model="crm.case.resource.type" id="type2">
+        <field name="name">Version 4.4</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>
+
+    <!--
+    Case Stage
+    -->
+         <!--    For Bugs    -->
+         
+    <record model="crm.case.stage" id="stage1">
+        <field name="name">Accepted as Bug</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage2">
+        <field name="name">Fixed</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage3">
+        <field name="name">Won't fix</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage4">
+        <field name="name">Invalid</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage5">
+        <field name="name">Awaiting Response</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage6">
+        <field name="name">Works For Me</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
new file mode 100755
index 00000000000..8794992b440
--- /dev/null
+++ b/addons/project_issue/project_issue_demo.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<!--
+		((((((((((( Demo Cases )))))))))))
+	-->
+<!--For Issue Tracking-->
+	<record id="crm_case_buginaccountsmodule0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_8"/>
+		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;5&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage1"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field name="analytic_account_id" ref="account.analytic_agrolait"/>
+		<field eval="15.0" name="duration"/>
+		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+	</record>
+	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
+		<field eval="time.strftime('%Y-%m-08')" name="date"/>
+		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
+		<field name="som" ref="base.som_normal"/>
+		<field eval="&quot;Take corrective actions&quot;" name="name"/>
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
+	</record>
+
+	<record id="crm_case_programnotgivingproperoutput0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
+		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.5" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage2"/>
+		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
+		<field name="project_id" ref="project.project_project_22"/>
+	</record>
+
+	<record id="crm_case_outputincorrect0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="account.analytic_project_1"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.3" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage3"/>
+		<field name="project_id" ref="project.project_project_23"/>
+		<field eval="&quot;Output incorrect&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_problemloadingpage0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_13"/>
+		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_14"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage4"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Problem loading page&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_pagenotfound0" model="project.issue">
+		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field name="analytic_account_id" ref="account.analytic_desertic_hispafuentes"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="1.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Page not Found&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_programmingerror0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Programming Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_logicalerrorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_constrainterror0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="7.3" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Constraint Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_errorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field eval="1" name="active"/>
+		<field eval="1.3" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_patcheserrorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="13.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_newfeaturestobeadded0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.2" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage1"/>
+		<field name="project_id" ref="project.project_project_21"/>
+		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_addmenustothemodule0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_1"/>
+		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;1&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_9"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage2"/>
+		<field name="project_id" ref="project.project_project_21"/>
+		<field eval="&quot;Add menus to the module&quot;" name="name"/>
+		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+	</record>
+
+	<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_2"/>
+		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage3"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+	</record>
+
+	<record id="crm_case_createnewobject0" model="project.issue">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field name="som" ref="base.som_happy"/>
+		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.45" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Create new object&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_improvereportsinhrms0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="15.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_improvereportsinpms0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="06.15" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+	</record>
+
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
new file mode 100755
index 00000000000..1fc5c3bce7d
--- /dev/null
+++ b/addons/project_issue/project_issue_menu.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+
+    ######################## ISSUE TRACKING (menu) ###########################
+    <!--
+        ALL BUGS
+    -->
+    <record model="ir.actions.act_window" id="project_issue_categ_act0">
+        <field name="name">Issues</field>
+        <field name="res_model">project.issue</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
+        <field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
+        <field name="search_view_id" ref="view_project_issue_filter"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="project_issue_calendar_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="project_issue_form_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" action="project_issue_categ_act0"/>
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
new file mode 100755
index 00000000000..343005d25d7
--- /dev/null
+++ b/addons/project_issue/project_issue_view.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="project_issue_categ_action" model="ir.actions.act_window">
+            <field name="name">Issue Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
+
+        <record id="project_issue_stage_act" model="ir.actions.act_window">
+            <field name="name">Issue Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
+        <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
+
+        <record model="ir.ui.view" id="project_issue_form_view">
+            <field name="name">Project Issue Tracker Form</field>
+            <field name="model">project.issue</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Issue Tracker Form">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="user_id"/>
+                        <field name="assigned_to" />
+                        <group colspan="2" col="4">
+                            <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
+                            <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        </group>
+                        <field name="project_id" required="True"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="General">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Communication"/>
+                                <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
+                                <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+                                <field name="email_from"/>
+                                <field name="analytic_account_id" />
+                            </group>
+                            <group col="3" colspan="2">
+                                <separator colspan="3" string="Status"/>
+                                <field name="type_id" colspan="3"/>
+                                <field name="priority" colspan="3"/>
+                                <field name="task_id" />
+                                <button string="Convert To Task"
+                                    name="convert_issue_task"
+                                    icon="gtk-index" type="object"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            </group>
+                            <separator string= "Description" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="4"/>
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" />
+                                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Date"/>
+                                <field name="create_date"/>
+                                <field name="write_date" />
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group colspan="2" col="2">
+                        		<separator string="Statistics" colspan="2" col="2"/>
+                        		<field name="day_open"/>
+                        		<field name="day_close"/>
+                    		</group>
+                            <group col="2" colspan="2">
+                                <separator string="References" colspan="2"/>
+                                <field name="id"/>
+                                <field name="active"/>
+                            </group>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <form string="Actions">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date" />
+                                    <field name="user_id" />
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="7" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                        <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'project.issue'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'project.issue'}"
+                           	icon="gtk-go-forward" type="action" />
+                        </page>
+                        <page string="Worklogs">
+                            <separator string="Timesheets" colspan="4" />
+                            <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                                <tree editable="top" string="Timesheet">
+                                    <field name="create_date" string="Date" />
+                                    <field name="user_id" readonly="1" />
+                                    <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="project_issue_tree_view">
+            <field name="name">Project Issue Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_issue_filter" model="ir.ui.view">
+            <field name="name">Project Issue Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Issue Tracker Search">
+                    <group>
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's bugs"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Bugs during last 7 days"
+                            />
+
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group>
+                        <field name="name" select='1' string="Subject"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project">
+                            <filter icon="terp-crm"
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="16">
+	                    <filter string="Stage" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'stage_id'}" />
+	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'priority'}" />
+	                    <filter string="Campaign" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'type_id'}" />
+	                    <separator orientation="vertical" />
+	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'partner_id'}" />
+	                    <filter string="Salesman" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'user_id'}" />
+	                    <separator orientation="vertical" />
+                	</group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_issue_calendar_view">
+            <field name="name">Project Issue Tracker Calendar</field>
+            <field name="model">project.issue</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
+
+        # ------------------------------------------------------
+        # Feature Requests
+        # ------------------------------------------------------
+
+        <record model="ir.ui.view" id="project_feature_tree_view">
+            <field name="name">Project Issue- Feature Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name" string="Feature description"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_feature_filter" model="ir.ui.view">
+            <field name="name">Project Issue- Feature Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Feature Tracker Search">
+                    <group>
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's features"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Features during last 7 days"
+                            />
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group>
+                        <field name="name" select='1' string="Feature description"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project">
+                            <filter icon="terp-crm"
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/project_issue/report/__init__.py b/addons/project_issue/report/__init__.py
new file mode 100755
index 00000000000..9fe3b084477
--- /dev/null
+++ b/addons/project_issue/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import project_issue_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
new file mode 100755
index 00000000000..ef1e002ae78
--- /dev/null
+++ b/addons/project_issue/report/project_issue_report.py
@@ -0,0 +1,52 @@
+from osv import fields,osv
+import tools
+from crm import crm
+
+class project_issue_report(osv.osv):
+    _name = "project.issue.report"
+    _auto = False
+    _inherit = "crm.case.report"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
+        'nbr': fields.integer('# of Issues', reaadonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'company_id' : fields.many2one('res.company', 'Company'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
+        'date_closed': fields.datetime('Close Date', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'project_issue_report')
+        cr.execute("""
+            create or replace view project_issue_report as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    c.categ_id,
+                    c.stage_id,
+                    to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
+                    u.company_id as company_id,
+                    c.priority as priority,
+                    c.project_id as project_id,
+                    c.type_id as type_id,
+                    count(*) as nbr,                    
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    project_issue c
+                left join
+                    res_users u on (c.id = u.id)
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
+                ,c.date_closed,u.company_id,c.priority,c.project_id,c.type_id
+            )""")
+
+
+project_issue_report()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
new file mode 100755
index 00000000000..72d665cdff0
--- /dev/null
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+ <!-- Report for project issue -->
+        <record id="view_project_issue_report_tree" model="ir.ui.view">
+            <field name="name">project.issue.report.tree</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+				<tree string="Project Issue">
+	              	<field name="name" />
+					<field name="month"/>
+					<field name="priority" />
+					<field name="stage_id" />
+					<field name="type_id" string="Type"/>
+					<field name="project_id" invisible="1"/>
+					<field name="company_id" invisible="1"/>
+                	<field name="nbr" string="#Project Issue"/>
+                    <field name="delay_close"/>
+                    <field name="state" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="stage_id"  invisible="1"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="date_closed" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_project_issue_report_graph" model="ir.ui.view">
+            <field name="name">project.issue.report.graph</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Project Issue" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_project_issue_report_filter" model="ir.ui.view">
+            <field name="name">project.issue.report.select</field>
+            <field name="model">project.issue.report</field>
+            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+               <data>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Year"]' position='replace'>
+                    	<filter string="This Year" icon="terp-sale" domain="[('name','=',time.strftime('%%Y'))]"/>
+           		</xpath>
+            	<xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Month"]' position='replace'>
+                    	<filter string="This Month" icon="terp-sale" domain="[('month','=',time.strftime('%%m'))]"  />
+            	</xpath>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="Lost"]' position='after'>
+                        <separator orientation="vertical"/>
+                    	<filter string="Closed Today" icon="terp-sale" domain="[('date_closed','=',time.strftime('%%Y/%%m/%%d'))]" />
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[1]/field[3]' position='after'>
+						<field name="project_id" widget="selection"/>
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[@string="Group By..."]' position='before'>
+               	       <newline/>
+                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                    		<filter icon="terp-sale"
+                    		string="Highest"
+                    		domain="[('priority','=','1')]"/>
+                    		<filter icon="terp-sale"
+                    		string="High"
+                    		domain="[('priority','=','2')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Normal"
+                    		domain="[('priority','=','3')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Low"
+                    		domain="[('priority','=','4')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Lowest"
+                    		domain="[('priority','=','5')]"/>
+                		</group>
+                		<newline/>
+				</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Company"]' position='replace'>
+					<filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
+            	</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
+            		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+            		<separator orientation="vertical"/>
+            		<filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}"/>
+            		<filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+            	</xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="action_project_issue_report" model="ir.actions.act_window">
+            <field name="name">Project Issue</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_project_issue_report_tree"/>
+            <field name="search_view_id" ref="view_project_issue_report_filter"/>
+        </record>
+
+
+       	<record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_project_issue_report_tree"/>
+	        <field name="act_window_id" ref="action_project_issue_report"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_project_issue_report_graph">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="view_project_issue_report_graph"/>
+	        <field name="act_window_id" ref="action_project_issue_report"/>
+	    </record>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
+  </data>
+</openerp>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
new file mode 100755
index 00000000000..811387ed55e
--- /dev/null
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_issue","project.issue","model_project_issue","crm.group_crm_manager",1,1,1,1
+"access_project_issue_report","project.issue.report","model_project_issue_report","crm.group_crm_manager",1,0,0,0
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
new file mode 100755
index 00000000000..6d87dd1a06f
--- /dev/null
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+
+
+    <record model="ir.rule.group" id="project_issue_rule_group">
+        <field name="name">project.issue.rule.group</field>
+        <field name="model_id" search="[('model','=','project.issue')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+    </record>
+ 	<record id="project_issue_rule" model="ir.rule">
+        <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
+        <field name="rule_group" ref="project_issue_rule_group"/>
+    </record>    
+
+  </data>
+</openerp>
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__openerp__.py
similarity index 100%
rename from addons/purchase/__terp__.py
rename to addons/purchase/__openerp__.py
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/purchase_analytic_plans/__terp__.py
rename to addons/purchase_analytic_plans/__openerp__.py
diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__openerp__.py
similarity index 100%
rename from addons/purchase_manual/__terp__.py
rename to addons/purchase_manual/__openerp__.py
diff --git a/addons/purchase_requisition/__terp__.py b/addons/purchase_requisition/__openerp__.py
similarity index 100%
rename from addons/purchase_requisition/__terp__.py
rename to addons/purchase_requisition/__openerp__.py
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__openerp__.py
similarity index 100%
rename from addons/report_designer/__terp__.py
rename to addons/report_designer/__openerp__.py
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__openerp__.py
similarity index 100%
rename from addons/report_intrastat/__terp__.py
rename to addons/report_intrastat/__openerp__.py
diff --git a/addons/resource/__terp__.py b/addons/resource/__openerp__.py
similarity index 100%
rename from addons/resource/__terp__.py
rename to addons/resource/__openerp__.py
diff --git a/addons/sale/__terp__.py b/addons/sale/__openerp__.py
similarity index 100%
rename from addons/sale/__terp__.py
rename to addons/sale/__openerp__.py
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/sale_analytic_plans/__terp__.py
rename to addons/sale_analytic_plans/__openerp__.py
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__openerp__.py
similarity index 100%
rename from addons/sale_delivery_report/__terp__.py
rename to addons/sale_delivery_report/__openerp__.py
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__openerp__.py
similarity index 100%
rename from addons/sale_journal/__terp__.py
rename to addons/sale_journal/__openerp__.py
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__openerp__.py
similarity index 100%
rename from addons/scrum/__terp__.py
rename to addons/scrum/__openerp__.py
diff --git a/addons/service/__terp__.py b/addons/service/__openerp__.py
similarity index 100%
rename from addons/service/__terp__.py
rename to addons/service/__openerp__.py
diff --git a/addons/smtpclient/__terp__.py b/addons/smtpclient/__openerp__.py
similarity index 100%
rename from addons/smtpclient/__terp__.py
rename to addons/smtpclient/__openerp__.py
diff --git a/addons/stock/__terp__.py b/addons/stock/__openerp__.py
similarity index 100%
rename from addons/stock/__terp__.py
rename to addons/stock/__openerp__.py
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__openerp__.py
similarity index 100%
rename from addons/stock_invoice_directly/__terp__.py
rename to addons/stock_invoice_directly/__openerp__.py
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__openerp__.py
similarity index 100%
rename from addons/stock_location/__terp__.py
rename to addons/stock_location/__openerp__.py
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__openerp__.py
similarity index 100%
rename from addons/stock_no_autopicking/__terp__.py
rename to addons/stock_no_autopicking/__openerp__.py
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__openerp__.py
similarity index 100%
rename from addons/stock_planning/__terp__.py
rename to addons/stock_planning/__openerp__.py
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__openerp__.py
similarity index 100%
rename from addons/subscription/__terp__.py
rename to addons/subscription/__openerp__.py
diff --git a/addons/users_ldap/__terp__.py b/addons/users_ldap/__openerp__.py
similarity index 100%
rename from addons/users_ldap/__terp__.py
rename to addons/users_ldap/__openerp__.py
diff --git a/addons/warning/__terp__.py b/addons/warning/__openerp__.py
similarity index 100%
rename from addons/warning/__terp__.py
rename to addons/warning/__openerp__.py
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 16c82e60d6b..033060ad1a7 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -33,11 +33,10 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-   #     'wizard/wizard_view.xml',
+        'wizard/wizard_view.xml',
         'wizard/wiki_wiki_page_open_view.xml',
         'wizard/wiki_create_menu_view.xml',
         'wizard/wiki_make_index_view.xml',
-        'wizard/wiki_show_diff_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
         'data/wiki_main.xml',