Merge lp:~openerp-community/openobject-addons/fix_726185_trunk into lp:openobject-addons

[Lorenzo Battistini]

[lp:~openerp-community/openobject-addons/fix_726185_trunk]

6357. By Vo Minh Thu on 2012-01-18

[MERGE] changes required for the "import hook" commit in the server.

6358. By Quentin (OpenERP) <email address hidden> on 2012-01-18

[MERGE] lp:915426

6359. By Quentin (OpenERP) <email address hidden> on 2012-01-18

[MERGE] lp:916704

6360. By Vo Minh Thu on 2012-01-18

[MERGE] tools.literal_eval -> ast.literal_eval (as we drop python 2.5 support).

6361. By Olivier Dony (Odoo) on 2012-01-18

[FIX] email_template: properly pass target model in composition wizard reloading action

This fixes reloading of the composition wizard after selecting
templating options in the new web client.

6362. By Launchpad Translations on behalf of openerp on 2012-01-19

Launchpad automatic translations update.

6363. By Vo Minh Thu on 2012-01-19

[FIX] document_ftp: break self-import (which is causing a segfault since the import-hook has been merged in the server).

6364. By Olivier Dony (Odoo) on 2012-01-19

[FIX] report_webkit: avoid using report name in temp file path, breaks with non-ASCII (translated) report names

6365. By Olivier Dony (Odoo) on 2012-01-19

[FIX] report_webkit: translations lookup should ignore report name for webkit reports

Webkit/Mako translations are quite different from RML
report translations, and very similar to translations
for Python code terms, i.e. with _(). The method to
lookup the translations at rendering time should thus
be similar to what _() does for Python code terms, and
not depend on the name of the report, which is not
known when exporting the translation template, and is
therefore not available in POT meta-data.
This bears no performance penalty, as we are still
only looking inside 'report'-typed translations with
the matching 'source term'.
The only downside is that this prevents per-report
translations, but this is not supported by our
translation import/export system anyway, so it
does not matter (msgid strings must be unique
within a PO file, and we don't support context-
sensitive PO files yet).

6366. By Launchpad Translations on behalf of openerp on 2012-01-20

Launchpad automatic translations update.

6367. By Quentin (OpenERP) <email address hidden> on 2012-01-20

[FIX+REF] account_analytic_analysis: fixed the dependancies and a bug related to wrong computation of is_overdue_quantity that was also counting the sales/purchases made instead of only considering the timesheet entries. Refactoring: 200 lines removed, as they were useless since commit 6305 (removal of consolidation on all fields), and as they were filthy and error prone since they were written -_-

6368. By Launchpad Translations on behalf of openerp on 2012-01-21

Launchpad automatic translations update.

6369. By Launchpad Translations on behalf of openerp on 2012-01-22

Launchpad automatic translations update.

6370. By Launchpad Translations on behalf of openerp on 2012-01-23

Launchpad automatic translations update.

6371. By Raphael Collet (OpenERP) on 2012-01-23

[MERGE] auction: view fixes

6372. By Raphael Collet (OpenERP) on 2012-01-23

[MERGE] crm: add missing partner email when creating opportunity

6373. By Raphael Collet (OpenERP) on 2012-01-23

[MERGE] document: remove group restriction from menu Document > Configuration

6374. By Fabien (Open ERP) on 2012-01-23

[IMP] product required in PO line

6375. By Olivier Dony (Odoo) on 2012-01-23

[REV] plugin_outlook: partial revert of accidental certificate removal in previous revision

6376. By Olivier Dony (Odoo) on 2012-01-23

[MERGE] l10n_nl: fix NL Chart of Account definition (prevented installation), courtesy of Stefan Rijnhart (Therp)

This includes fixing several apparent copy/paste
errors, as well as the type of Debtors and Creditors
accounts

6377. By Launchpad Translations on behalf of openerp on 2012-01-24

Launchpad automatic translations update.

6378. By Raphael Collet (OpenERP) on 2012-01-24

[MERGE] import_google: fix external_id_field in import wizard

6379. By Raphael Collet (OpenERP) on 2012-01-24

[MERGE] lp:912623 (account: fix default date in wizard closing fiscal year)

6380. By Raphael Collet (OpenERP) on 2012-01-24

[MERGE] lp:885387 (hr_attendance: fix code that checks alternance of sign-in/sign-out)

6381. By Raphael Collet (OpenERP) on 2012-01-24

[MERGE] purchase: refactor onchange_product_id, stock: add test case

6382. By Raphael Collet (OpenERP) on 2012-01-24

[MERGE] delivery: increase size of character field

6383. By Lorenzo Battistini on 2012-01-24

[MERGE] fix_726185_trunk

6384. By Lorenzo Battistini on 2012-01-24

[IMP] considering priorities in tasks scheduling

Unmerged revisions

6384. By Lorenzo Battistini on 2012-01-24

[IMP] considering priorities in tasks scheduling

6383. By Lorenzo Battistini on 2012-01-24

[MERGE] fix_726185_trunk

=== modified file 'project/project.py'
--- project/project.py	2012-01-09 13:12:05 +0000
+++ project/project.py	2012-01-24 19:46:27 +0000
@@ -1042,6 +1042,11 @@
 %s  resource = %s
 ''' % (ident, 'User_'+str(task.user_id.id))
 
+            # http://faces.homeip.net/doc/node66.html
+            priority = 500 + (50 - 10 * int(task.priority))
+            result += '''%s  priority = %s
+''' % (ident, str(priority))
+
         result += "\n"
         return result
 

=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py	2012-01-09 15:33:02 +0000
+++ project_long_term/project_long_term.py	2012-01-24 19:46:27 +0000
@@ -222,6 +222,8 @@
         context = context or {}
         if type(ids) in (long, int,):
             ids = [ids]
+        task_pool = self.pool.get('project.task')        
+        resource_pool = self.pool.get('resource.resource')
         projects = self.browse(cr, uid, ids, context=context)
         result = self._schedule_header(cr, uid, ids, context=context)
         for project in projects:
@@ -256,6 +258,17 @@
                     'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
                     'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
                 }, context=context)
+                
+                if phase.task_ids:
+                    for task in phase.task_ids:
+                        if task.state != 'done' and task.state != 'cancelled':
+                            vals = {}
+                            #Getting values of the Tasks
+                            temp = eval("p.Task_%s"%task.id)                                               
+                            vals.update({'date_start' : temp.start.strftime('%Y-%m-%d %H:%M:%S')})
+                            vals.update({'date_end' : temp.end.strftime('%Y-%m-%d %H:%M:%S')})
+                            task_pool.write(cr, uid, task.id, vals, context=context)
+                        
         return True
 project()
 

=== modified file 'project_long_term/wizard/project_compute_phases.py'
--- project_long_term/wizard/project_compute_phases.py	2011-12-19 16:54:40 +0000
+++ project_long_term/wizard/project_compute_phases.py	2012-01-24 19:46:27 +0000
@@ -26,7 +26,8 @@
     _description = 'Project Compute Phases'
     _columns = {
         'target_project': fields.selection([
-            ('all', 'Compute All My Projects'),
+            ('all', 'Compute All Projects'),
+            ('my', 'Compute All My Projects'),
             ('one', 'Compute a Single Project'),
             ], 'Schedule', required=True),
         'project_id': fields.many2one('project.project', 'Project')
@@ -49,6 +50,8 @@
 
         if data['target_project'] == 'one':
             project_ids = [data['project_id'][0]]
+        elif data['target_project'] == 'all':
+            project_ids = project_pool.search(cr, uid, [('state', '!=', 'template')], context=context)
         else:
             project_ids = project_pool.search(cr, uid, [('user_id','=',uid)], context=context)
 

=== modified file 'project_long_term/wizard/project_compute_phases_view.xml'
--- project_long_term/wizard/project_compute_phases_view.xml	2011-10-27 21:11:24 +0000
+++ project_long_term/wizard/project_compute_phases_view.xml	2012-01-24 19:46:27 +0000
@@ -11,7 +11,7 @@
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Schedule Phases" />
                         <field name="target_project" colspan="4"/>
-                        <field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
+                        <field name="project_id" colspan="4" attrs="{'invisible':['|',('target_project','=','all'),('target_project','=','my')], 'required':[('target_project','!=','all'),('target_project','!=','my')]}"/>
                         <separator colspan="4"/>
                         <group colspan="2" col="2">
                         </group>