openerp-dev-web team mailing list archive

["uco \(OpenERP\)" <uco@xxxxxxxxxxx>]

uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #690109 The Parent Project field gives access to the list of analytic accounts
  https://bugs.launchpad.net/bugs/690109
  #691481 bug with the "lead converted into opportunity" log 
  https://bugs.launchpad.net/bugs/691481


[BUG FIXES]:
-------------
* lp:690109 :
  -> The Parent Project field gives access to the list of analytic accounts.

* lp:691481 :
  -> Bug with the "lead converted into opportunity" log.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/44199
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'crm/board_crm_view.xml'
--- crm/board_crm_view.xml	2010-12-15 06:35:01 +0000
+++ crm/board_crm_view.xml	2010-12-20 09:25:39 +0000
@@ -153,7 +153,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
             name="Sales Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"

=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py	2010-12-14 07:37:12 +0000
+++ crm/wizard/crm_lead_to_opportunity.py	2010-12-20 09:25:39 +0000
@@ -89,7 +89,7 @@
                 self.pool.get('mailgate.message').write(cr, uid, msg_ids, {
                     'partner_id': lead.partner_id.id
                 }, context=context)
-            self.log(cr, uid, lead.id,
+            leads.log(cr, uid, lead.id,
                 _("Lead '%s' has been converted to an opportunity.") % lead.name)
 
         return {

=== modified file 'project/project.py'
--- project/project.py	2010-12-17 12:38:44 +0000
+++ project/project.py	2010-12-20 09:25:39 +0000
@@ -129,6 +129,7 @@
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {

=== modified file 'project/project_data.xml'
--- project/project_data.xml	2010-08-12 07:31:45 +0000
+++ project/project_data.xml	2010-12-20 09:25:39 +0000
@@ -17,12 +17,13 @@
         
         <!--
 		Resource: project.project
-		-->
+		
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
 	
 		<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
+        -->
     </data>
 </openerp>

=== modified file 'project/project_demo.xml'
--- project/project_demo.xml	2010-11-19 10:25:25 +0000
+++ project/project_demo.xml	2010-12-20 09:25:39 +0000
@@ -241,6 +241,11 @@
         </record>
 
         <!-- Projects -->
+        <record id="all_projects_account" model="project.project">
+            <field name="name">Projects</field>
+            <field name="code">3</field>
+        </record>
+        
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2010-12-17 12:38:44 +0000
+++ project/project_view.xml	2010-12-20 09:25:39 +0000
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" string="Parent Project"/>
+                        <field name="parent_id"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>

=== modified file 'project_caldav/project_caldav.py'
--- project_caldav/project_caldav.py	2010-12-16 04:54:09 +0000
+++ project_caldav/project_caldav.py	2010-12-20 09:25:39 +0000
@@ -41,6 +41,8 @@
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
+        'recurrency': fields.boolean('Recurrency', help="Recurrent Tasks"),                                    
+        'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Task."),
     }
     _defaults = {
         'state': 'draft',