From 29918c64184ff2812d602db062ab18eed3c2f933 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Wed, 25 Apr 2012 17:39:08 +0530
Subject: [IMP] rename UOM to Unit of Measure everywhere in
 sale,stock,purchase,project_long_term and project_planning

bzr revid: jap@tinyerp.com-20120425120908-z13f1k2an7q01b8j
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..b29bd8cbf22 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -110,7 +110,7 @@ class project_phase(osv.osv):
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of phases."),
         'duration': fields.float('Duration', required=True, help="By default in days", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'product_uom': fields.many2one('product.uom', 'Duration Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
-- 
cgit v1.2.3


From 56e5d0de6250317cee3971e25c58bafd3bb6b4e3 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 12:32:01 +0530
Subject: [IMP]project_long_term: add button and state at topbar

bzr revid: kjo@tinyerp.com-20120426070201-zwwqq9uijfh2byex
---
 .../project_long_term/project_long_term_view.xml   | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7231395a2a9..219cccae6e2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -103,7 +103,18 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Phase">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
+                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
+                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                    </div>
+                </div>
+                <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
                             <field name="name" colspan="4"/>
@@ -128,15 +139,6 @@
                                     <field name="date_end"/>
                                   </form>
                              </field>
-                            <separator string="" colspan="4"/>
-                            <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
-                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                                <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                            </group>
                         </page>
                         <page string="Tasks Details">
                             <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
@@ -173,6 +175,7 @@
                         </page>
                     </notebook>
                     <newline/>
+                </sheet>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From d1147c51e9365f4a231f77aaad71b1652c4317f8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:04:46 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..9de76097c9c 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
-- 
cgit v1.2.3


From a2a05cfc196ce72613501cb3bc5a962c2e359ae2 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:27:48 +0530
Subject: [IMP]:improved titles State by Status everywhere

bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
---
 addons/project_long_term/project_long_term.py       | 2 +-
 addons/project_long_term/project_long_term_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..12278fd2980 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7231395a2a9..d6c2dcb43e2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -239,7 +239,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
-- 
cgit v1.2.3


From b3fa4ccf5cd03f1cfcac069ef7092affb362fc8b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 11:14:45 +0200
Subject: [IMP] removed icons from topbar

bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9cbbfaf75f3..02412a20a1f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,11 +143,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft"/>
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                     </div>
-- 
cgit v1.2.3


From 5ee2a8abde8739f8c0b72846f3c9634c1b0b48c4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 17:58:15 +0200
Subject: [WIP] Kanban project cleanup

bzr revid: fme@openerp.com-20120522155815-y23ps3bs32i9vqlu
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e1b58745a6..2b2bda6bc43 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -129,9 +129,9 @@
                     <field name="use_phases"/>
                     <field name="phase_count"/>
                 </field>
-                <xpath expr="//div[@id='list']" position="inside">
-                    <a t-if="record.use_phases.raw_value" class="oe_project_buttons"
-                        id="4" name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_phases.raw_value"
+                        name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From c958ecce52827e8bf91215c939d88559033199fd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 15:24:46 +0530
Subject: [IMP] project_long_term : added missing filter string in search view.

bzr revid: mdi@tinyerp.com-20120528095446-vjcjr4xq6qc3ltmq
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1e9f50cdd87..ad3a6c9b9e0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -272,7 +272,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                            <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         </field>
                         <field name="date_start"/>
                         <field name="date_end"/>
-- 
cgit v1.2.3


From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 addons/project_long_term/project_long_term.py      | 24 +++++++++++++++++-----
 .../project_long_term/project_long_term_view.xml   | 16 +++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..11ecdd940f9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,24 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+#    _defaults = {
+#        'use_phases': True,
+#    }
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if vals.get('use_phases', False):
+            self.project_create(cr, uid, obj_id, vals, context)
+        return obj_id
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1e9f50cdd87..2d7412f7e7d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -368,6 +368,22 @@
         src_model="project.phase"
         view_mode="tree,form"
         />
+     
+    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<group name="project" position="inside">
+            	    <field name="use_phases"/>
+            	</group>
+            </field>
+        </record>
 
     # ------------------------------------------------------
     # Menu Items
-- 
cgit v1.2.3


From 87040b2390a496a96c2c69e09cfb2f19769b1f27 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:29:34 +0530
Subject: [IMP]:project:improved project view

bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 2d7412f7e7d..9aaf52e27ff 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,9 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks"]' position='after'>
+                    <tr name="use_phases">
+                        <th>Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
+                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 4fc454658fdb4ed9370dcb94bb1706b3609341da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:45:41 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9aaf52e27ff..c15c7d5dd23 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -108,7 +108,7 @@
                     <tr name="use_phases">
                         <th>Phases Planing</th>
                         <td><field name="use_phases" nolabel="1"/></td>
-                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 63cf0f61906dcc1726a5e4596666556975c7902c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 13:07:28 +0530
Subject: [IMP]:project:improved view and code.

bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
---
 addons/project_long_term/project_long_term_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c15c7d5dd23..fef0ef46835 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,10 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks"]' position='after'>
-                    <tr name="use_phases">
-                        <th>Phases Planing</th>
-                        <td><field name="use_phases" nolabel="1"/></td>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr name="use_phases_row">
+                        <td>
+                            <group class="oe_form_group_label_border">
+                                <field name="use_phases"/>
+                            </group>
+                        </td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
-- 
cgit v1.2.3


From 04d5c34200672f9f83c78bbf99593dc5e01123e2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:20:24 +0530
Subject: [IMP]:improved project view as new style and format

bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
---
 addons/project_long_term/project_long_term_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fef0ef46835..5117b3f9970 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -106,11 +106,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
                     <tr name="use_phases_row">
-                        <td>
-                            <group class="oe_form_group_label_border">
-                                <field name="use_phases"/>
-                            </group>
-                        </td>
+                        <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
-- 
cgit v1.2.3


From 36c99ad66348e82cede092baca08ce87609b16dc Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:56:07 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530092607-egv156h2k9853xvf
---
 addons/project_long_term/project_long_term_view.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5117b3f9970..c8b06426c91 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -97,7 +97,14 @@
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
-
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+        
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
@@ -114,15 +121,6 @@
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-- 
cgit v1.2.3


From fc9e75519f5a3c1a2fda398ba6963f71a8e8a001 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 15:01:39 +0530
Subject: improved code for wrong inherit project task search view

bzr revid: apa@tinyerp.com-20120530093139-m1k5gm9hfxm6n6af
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c8b06426c91..9497b3ad6ec 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -332,7 +332,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <field name="project_id" position="after">
+                <field name="name" position="after">
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-- 
cgit v1.2.3


From 9e3b216151899b1005f59e69a14c4fc6e5ad828f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 30 May 2012 17:09:00 +0200
Subject: [FIX] project long_term: fixed a bug with inheriting search view from
 project.task (as with project_scrum)

bzr revid: tde@openerp.com-20120530150900-ucyokg8ah09kv189
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1e9f50cdd87..eb2c86a0f1b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -330,7 +330,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <field name="project_id" position="after">
+                <field name="user_id" position="before">
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-- 
cgit v1.2.3


From 623fd428bd909e92b1f05bfd283f89aa77f33b9a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 12:50:56 +0200
Subject: [IMP] xml of topbars, removed oe_right, oe_clear

bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
---
 addons/project_long_term/project_long_term_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eb2c86a0f1b..936f9995606 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -148,10 +148,7 @@
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
-- 
cgit v1.2.3


From 48f8823bad836df2dfae55795625470ff59061c0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 14:11:39 +0200
Subject: [IMP] replaced all oe_form_topbar with the new <header> style

bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 936f9995606..0c175a4ef7e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -142,14 +142,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5ab90b048ba..cba3ead23c5 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -115,7 +115,7 @@
                     <tr name="use_phases_row">
                         <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
                         <td><field name="use_phases" nolabel="1"/></td>
-                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button icon=" terp-emblem-important" class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 7e5c7916a2a58374abc5576b9c743c96de9c95d8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Jun 2012 21:49:46 +0200
Subject: [IMP] form view, removed project_planning

bzr revid: fp@tinyerp.com-20120609194946-5pgqdhkf1mmrleox
---
 .../project_long_term/project_long_term_view.xml   | 81 ++++++++++++----------
 .../wizard/project_compute_phases_view.xml         | 22 +++---
 .../wizard/project_compute_tasks_view.xml          | 17 ++---
 3 files changed, 61 insertions(+), 59 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0c175a4ef7e..1717fb950f7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -37,8 +37,8 @@
             <field name="model">project.user.allocation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project User Allocation">
-                    <group colspan="4" col="6">
+                <form string="Project User Allocation" version="7.0">
+                    <group col="4">
                         <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
@@ -141,7 +141,7 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
@@ -150,34 +150,44 @@
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-                <sheet string="Project Phase" layout="auto">
-                    <group colspan="6" col="6">
-                        <group colspan="6" col="7" >
-                            <field name="name" colspan="4"/>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                <sheet>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="date_start"/>
                             <field name="date_end"/>
-                            <field name="duration"/>
-                            <field name="product_uom" nolabel="1"/>
+                        </group><group>
+                            <label for="duration"/>
+                            <div>
+                                <field name="duration" class="oe_form_inline"/>
+                                <field name="product_uom"/>
+                            </div>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Planning of Users">
-                            <field colspan="4" name="user_ids" nolabel="1">
+                            <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
+                                      <field name="user_id"/>
+                                      <field name="date_start"/>
+                                      <field name="date_end"/>
                                   </tree>
-                                  <form string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start" />
-                                    <field name="date_end"/>
+                                  <form string="Project Users" version="7.0">
+                                      <group col="4">
+                                          <field name="user_id"/>
+                                          <field name="date_start" />
+                                          <field name="date_end"/>
+                                      </group>
                                   </form>
                              </field>
                         </page>
                         <page string="Tasks Details">
-                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                            <field name="task_ids" readonly="1" context="{'default_project_id' :project_id}">
                                  <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
@@ -193,24 +203,23 @@
                              </field>
                         </page>
                         <page string="Constraints">
-                           <group colspan="2" col="2">
-                                <separator string="Constraints" colspan="2"/>
-                                <field name="constraint_date_start"/>
-                                <field name="constraint_date_end"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Displaying Settings" colspan="2"/>
-                                <field name="sequence"/>
+                           <group>
+                               <group>
+                                    <field name="constraint_date_start"/>
+                                    <field name="constraint_date_end"/>
+                                </group>
+                                <group>
+                                    <field name="sequence"/>
+                                </group>
                             </group>
-                           <separator colspan="4" string="Force Assigned Users"/>
-                           <field colspan="4" name="user_force_ids" nolabel="1"/>
-                           <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <separator string="Force Assigned Users"/>
+                           <field name="user_force_ids"/>
+                           <separator string="Previous Phases"/>
+                           <field name="previous_phase_ids"/>
+                           <separator string="Next Phases"/>
+                           <field name="next_phase_ids"/>
                         </page>
                     </notebook>
-                    <newline/>
                 </sheet>
                 </form>
             </field>
@@ -328,7 +337,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
-                    <field name="phase_id" select="1"/>
+                    <field name="phase_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index b6afc26276b..df7e432b0ac 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -7,19 +7,15 @@
             <field name="model">project.compute.phases</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                  <form string="Schedule Phases">
-                    <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')]}"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2"> <!-- Improve me -->
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                        </group>
-                    </group>
+                  <form string="Schedule Phases" version="7.0">
+                      <header>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
+                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                      <header>
+                      <group string="Schedule Phases">
+                          <field name="target_project"/>
+                          <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
+                      </group>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index bf27e7e7286..c91b8f953c1 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,16 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks">
-                    <group colspan="4">
-                        <field name="project_id" colspan="4"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2">
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                      </group>
-                    </group>
+                     <header>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
+                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                     <header>
+                     <group>
+                         <field name="project_id"/>
+                     </group>
                   </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 1f885950b4f04c75ab0c7217778a371ddd8867c2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 10 Jun 2012 00:28:49 +0200
Subject: [FIX] headers

bzr revid: fp@tinyerp.com-20120609222849-gm9loztzarjyn7pl
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 2 +-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index df7e432b0ac..bf2c51e41e6 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -11,7 +11,7 @@
                       <header>
                           <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
                           <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                      <header>
+                      </header>
                       <group string="Schedule Phases">
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index c91b8f953c1..2e494166464 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -11,7 +11,7 @@
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                     <header>
+                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
-- 
cgit v1.2.3


From c95b6d26abc54d3d597cb577410033afba971363 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 11 Jun 2012 04:46:47 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120609053947-vtt4bvvka4m7ss08
bzr revid: launchpad_translations_on_behalf_of_openerp-20120610043726-y2hq6n49adbitr1p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120611044647-txtguaozavg1ipp2
---
 addons/project_long_term/i18n/ja.po | 516 ++++++++++++++++++++++++++++++++++++
 1 file changed, 516 insertions(+)
 create mode 100644 addons/project_long_term/i18n/ja.po

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
new file mode 100644
index 00000000000..3bdbd1f4961
--- /dev/null
+++ b/addons/project_long_term/i18n/ja.po
@@ -0,0 +1,516 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-10 03:12+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-11 04:46+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "次のフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "割当ユーザ"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "進捗"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "進行中のフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr "設定の表示"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "スケジュール"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "日"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "フェーズのユーザ割当"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"プロジェクトは異なるフェーズに分割することができます。各フェーズについて、ユーザの割当、異なるタスクの説明と前後のフェーズへのリンク、自動スケジューリング"
+"のための日付制約の追加、利用可能ユーザの計画による長期計画、プロジェクト作業を開始するタスクのシリーズの中にフェーズを変換を定義することができます。"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "単一のプロジェクトの計算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "前のフェーズ"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UoMは期間のための単位です。"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "ユーザの計画"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " これは開始日と期間に応じてスケジューラによって計算されます。"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "締切"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "全私のプロジェクトの計算"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "プロジェクトのユーザ割当"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "計算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "関連タスクを元に計算"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "期間の単位"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "最小の開始日"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "リソース"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "私のプロジェクト"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "開始日"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "関連タスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "新規フェーズ"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "スケジュールするプロジェクトを指定して下さい。"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "この日付の後に強制的に開始するフェーズ"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr "これはプロジェクト日付または前フェーズの終了日によりスケジューラにより計算されます。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "月"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "フェーズ開始日はフェーズ終了日より小さい必要があります。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "開始月"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "この日付の前に強制的に終了させるフェーズ"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "プロジェクトのリソースはスケジューラによって自動的に計算されます。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "保留中フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "プロジェクトの計算タスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "制約"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "フェーズのリストを表示する時に、並び順を与えます。"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "プロジェクトのフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "残り時間数"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "作業時間"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "フェーズのスケジュール"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "開始フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "合計時間数"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "フェーズ"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"フェーズはドラフト状態で作成されます。\n"
+"　フェーズが開始されると、進行中状態になります。\n"
+"　フェーズのレビューが必要であれば、保留中状態です。\n"
+"　フェーズが終了すると、完了状態にセットされます。"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "タスク詳細"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "期間"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "プロジェクトのユーザ"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "プロジェクトのフェーズ"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"全てまたは特定のプロジェクトのフェーズのスケジュールします。その後、ガントチャートビューを開きます。\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "プロジェクトの計算フェーズ"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "フェーズのループは許されません。"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "リソースの休暇"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "タスクのスケジュール"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "日数のデフォルト"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "強制割当ユーザ"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "スケジュール"
-- 
cgit v1.2.3


From d496a2cb231f4056314f1278f69c69949c74d41e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Jun 2012 18:10:14 +0200
Subject: [FIX] *: Correct @version spec in new-style forms, after FP's recent
 merge

bzr revid: odo@openerp.com-20120611161014-19p6rd5qpkmmijmg
---
 addons/project_long_term/wizard/project_compute_tasks_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 2e494166464..ac30a3aa6d9 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -7,7 +7,7 @@
             <field name="model">project.compute.tasks</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                 <form string="Schedule Tasks">
+                 <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-- 
cgit v1.2.3


From b2a5ab368d64559375a861de6270f0d9ef3e5667 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Jun 2012 12:07:31 +0200
Subject: [IMP] account_analytic_analysis: code improved for automation of
 project creation

bzr revid: qdp-launchpad@openerp.com-20120613100731-9so4m41fz7yrtb5w
---
 addons/project_long_term/project_long_term.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 11ecdd940f9..7e50e9a6793 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,16 +275,11 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
-#    _defaults = {
-#        'use_phases': True,
-#    }
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
-        if vals.get('use_phases', False):
-            self.project_create(cr, uid, obj_id, vals, context)
-        return obj_id
+
+    def _trigger_project_creation(vals):
+        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+        return res or vals.get('use_phases')
+
 account_analytic_account()
 
 class project_task(osv.osv):
-- 
cgit v1.2.3


From 618aacc5a707c1c7ad952f1e4ba10f14d8274a85 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 13 Jun 2012 18:45:07 +0530
Subject: [IMP]:passed base menus ref instead of project.

bzr revid: apa@tinyerp.com-20120613131507-1yezuu5k7dc1h9s3
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a81650b596b..f1d73850b3e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -409,7 +409,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
-- 
cgit v1.2.3


From a9e1ede2774dd01d272bf1bb8248114697df2281 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Thu, 14 Jun 2012 13:01:54 +0530
Subject: [IMP]:Project:Added Active and return flow

bzr revid: tch@tinyerp.com-20120614073154-fhpy06yyex5x0h8a
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1717fb950f7..87ca1a9f6c8 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,9 +143,9 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft"/>
-                    <button string="Done" name="set_done" states="pending,open"/>
-                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
+                    <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
+                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_active_flow"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-- 
cgit v1.2.3


From dc1edf44be5593f9048f442a8aec68ae5250d953 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 14 Jun 2012 12:09:22 +0200
Subject: [IMP] project: implemented the privacy/visibility record rule in a
 cleaner way + some cleanup and bug fixing related to contract management

bzr revid: qdp-launchpad@openerp.com-20120614100922-5g29ui88nhqojon2
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 7e50e9a6793..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -276,8 +276,8 @@ class account_analytic_account(osv.osv):
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
 
-    def _trigger_project_creation(vals):
-        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_phases')
 
 account_analytic_account()
-- 
cgit v1.2.3


From 0d35f923bfa02e75015ba4a8c7de4e2816810e1a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 14 Jun 2012 18:47:35 +0530
Subject: [IMP] project_long_term: improved color of button based on business
 flow

bzr revid: tpa@tinyerp.com-20120614131735-vgjxy0dek0yhw1wh
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 87ca1a9f6c8..e4839017e72 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -135,7 +135,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_active_flow"/>
-                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
+                    <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From a37e3b59cb0fa0ff3dcede5d85ac0d256ad25125 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 12:37:10 +0200
Subject: [FIx] project_long_term: module inheritancy

bzr revid: qdp-launchpad@openerp.com-20120615103710-p4pn5dqnblkeb7dj
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f1d73850b3e..f4e17d9929c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -376,7 +376,7 @@
         src_model="project.phase"
         view_mode="tree,form"
         />
-     
+
     <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -385,11 +385,11 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project" name="project_sep"/>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
                 </xpath>
-            	<group name="project" position="inside">
-            	    <field name="use_phases"/>
-            	</group>
+                <xpath expr="//separator[@name='project_sep']" position="after">
+                    <field name="use_phases"/>
+                </group>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 9970943ca0fc1fdc727be8cee82a84c3ce12d47c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 13:54:50 +0200
Subject: [FIx] project_long_term: tag mismatch

bzr revid: qdp-launchpad@openerp.com-20120615115450-favh7x3d932zb1vo
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f4e17d9929c..196c6793faf 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -389,7 +389,7 @@
                 </xpath>
                 <xpath expr="//separator[@name='project_sep']" position="after">
                     <field name="use_phases"/>
-                </group>
+                </xpath>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 15:10:56 +0200
Subject: [IMP] contract management: misc code cleaning and improvements

bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 196c6793faf..93addfe6cf2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -387,7 +387,7 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
                 </xpath>
-                <xpath expr="//separator[@name='project_sep']" position="after">
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_phases"/>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 34891cff993efbff606f8442068df39e867078eb Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 15 Jun 2012 16:39:22 +0200
Subject: [REF] project_long_term: Clean the views

bzr revid: stw@openerp.com-20120615143922-5oq815a5rs1sop1l
---
 addons/project_long_term/wizard/project_compute_phases.py       | 2 +-
 addons/project_long_term/wizard/project_compute_phases_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 4a66cecf9cd..85ab158e0b2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory):
         'target_project': fields.selection([
             ('all', 'Compute All My Projects'),
             ('one', 'Compute a Single Project'),
-            ], 'Schedule', required=True),
+            ], 'Action', required=True),
         'project_id': fields.many2one('project.project', 'Project')
     }
     _defaults = {
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index bf2c51e41e6..37c7256cb7c 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -10,9 +10,8 @@
                   <form string="Schedule Phases" version="7.0">
                       <header>
                           <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                       </header>
-                      <group string="Schedule Phases">
+                      <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
-- 
cgit v1.2.3


From 31e9041261063faf10f687e9303c8640b53efee4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 15 Jun 2012 16:39:34 +0200
Subject: [REF] project_long_term: Clean the views

bzr revid: stw@openerp.com-20120615143934-p2ymorv7b3khslud
---
 addons/project_long_term/wizard/project_compute_tasks_view.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index ac30a3aa6d9..3ceac7e9a9e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -10,7 +10,6 @@
                  <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:48:35 +0200
Subject: [IMP] project: version 7.0 for the project form view

bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
---
 addons/project_long_term/project_long_term_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 93addfe6cf2..64f503a8577 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,7 +104,7 @@
             view_type="form"
             view_mode="tree,form"
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
-        
+
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
@@ -112,10 +112,9 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr name="use_phases_row">
-                        <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
-                        <td><field name="use_phases" nolabel="1"/></td>
-                        <td style="text-align:right;"><button icon=" terp-emblem-important" class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From d8f70237c541011b66c5476ed90d86ff48bed53f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 18 Jun 2012 10:51:55 +0200
Subject: [REF] Review the form views

bzr revid: stw@openerp.com-20120618085155-jtksg0pxpstd7dkc
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1717fb950f7..119d6c1c90e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -213,7 +213,7 @@
                                 </group>
                             </group>
                            <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids"/>
+                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
-- 
cgit v1.2.3


From 4311eaa121ac053f145ec41298717a6651d6631f Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 18 Jun 2012 14:42:36 +0530
Subject: [REM] : Remove cancel button from wizard

bzr revid: aja@tinyerp.com-20120618091236-3e8vhdb4thokf72i
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 3 +--
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index bf2c51e41e6..7aae5f8567e 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
                       </header>
                       <group string="Schedule Phases">
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index ac30a3aa6d9..5b5de0ed072 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From 0f20a859ba7f5dfd77d7e03811671a3eb9740948 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 18 Jun 2012 18:00:34 +0530
Subject: [IMP]change in project manager's access right for calendar attendance

bzr revid: dhr@tinyerp.com-20120618123034-covf7ordsjaux5l0
---
 addons/project_long_term/security/ir.model.access.csv | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 6ca496f691d..2a00088b8f4 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -7,3 +7,6 @@ access_resource_resource_user,user.user user,resource.model_resource_resource,pr
 access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
+
+
-- 
cgit v1.2.3


From ca7d45dc6b124b1ec90e9f3deb275fa5b55b47f5 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 18 Jun 2012 18:54:37 +0530
Subject: [IMP] project_*: Update search views

bzr revid: psi@tinyerp.com-20120618132437-2yuhcs84vmc768go
---
 .../project_long_term/project_long_term_view.xml   | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 541738ed69d..3286e9a4c3d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
+                       <field name="user_id"/>
+                       <field name="phase_id"/>
+                       <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -272,18 +272,19 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
+                        <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+                        <field name="project_id"/>
                     </group>
-                    <newline/>
+                    <newline/> 
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From f2fba32b562e530cc54f48ea56145db15403af62 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 19 Jun 2012 10:56:18 +0200
Subject: [REF] Change the CSS classes

bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 119d6c1c90e..18babab66a4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,9 +151,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
                     </h2>
@@ -164,7 +164,7 @@
                         </group><group>
                             <label for="duration"/>
                             <div>
-                                <field name="duration" class="oe_form_inline"/>
+                                <field name="duration" class="oe_inline"/>
                                 <field name="product_uom"/>
                             </div>
                         </group>
-- 
cgit v1.2.3


From e80980330b63f1c25ab7a582164975c4402bff09 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 20 Jun 2012 15:42:05 +0530
Subject: [USA] replaced red button class oe_form_button_active_flow to
 oe_highlight

bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0d1b8ebd8c4..7ddc7fec1ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,8 +143,8 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
-                    <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
                     <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
                     <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-- 
cgit v1.2.3


From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 16:19:23 +0530
Subject: [IMP]Added highlight button on wizard

bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 2 +-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 7502fd68076..91d06bdb52b 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 5b5de0ed072..c42b3dbc674 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From 6e30c1323dc08e589481ea481ef33a4e8106eee4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 21 Jun 2012 05:25:27 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
---
 addons/project_long_term/i18n/sv.po | 527 ++++++++++++++++++++++++++++++++++++
 1 file changed, 527 insertions(+)
 create mode 100644 addons/project_long_term/i18n/sv.po

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
new file mode 100644
index 00000000000..c93e11abe4e
--- /dev/null
+++ b/addons/project_long_term/i18n/sv.po
@@ -0,0 +1,527 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-20 14:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Nästa fas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Projektets aktiviteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Ansluten användare"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Förlopp"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "I aktiva faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Schemalägg"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Fel! Du kan inte eskalera till samma projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Dag"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Fas användarfördelning"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Ett projekt kan delas in i flera olika faser. Varje fas kan du definiera "
+"användares beläggning, beskriva olika aktivieteter och länka dina faser till "
+"andra faser, datumregler för automatisk schemaläggning. Använd "
+"långtidsplanering för detaljplanera dina användares beläggning, konvertera "
+"dina faser till en serie av aktiviteter när projektarbetet verkligen kommer "
+"igång."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Beräkna ett enskilt projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Föregående fas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Enhet (mätenhet) är enheter för att beskriva varaktigheten"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Personalplanering"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Beräknas av schemaläggaren med hänsyn till startdatum och varaktighet."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Slutdatum"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Tidsfrist"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Beräkna alla mina projekt"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (kopia)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Personalplanering i projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Beräkna"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Ny"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Beräkning baserad på relaterade aktiviteter"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Varaktighetsenhet"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Tidigaste startdatum"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Resurser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Mina projekt"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Startdatum"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Relaterade aktiviteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Nya faser"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Vänlgen ange ett projekt att schemalägga."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Tvinga fasen att starta efter detta datum"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Projektaktiviteter"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Beräknas av schemaläggaren i enlighet med projektdatum eller slutdatum från "
+"föregående fas."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Fasens startdatum måste föregå slutdatum."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Startmånad"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Startdatum"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Tvinga fasen att slutföras före detta datum"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Projektresurserna kan automatiskt beräknas av schemaläggaren"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Preliminär"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Vilande faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Vilande"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Användare"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Beräkning av projektaktivieteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Begränsningar"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Ger ordningsföljden vid listning av faser."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Projektfaser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Klar"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Pågående"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Återstående timmar"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Arbetstid"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Schemalägg faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Startfas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Totalt antal timmar"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Användare"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Fas"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Om fasen är ny är status 'Preliminär'.\n"
+" Om fasen är startad övergår status till 'Pågående'.\n"
+" Om granskning är nödvändig är status 'vilande'.\n"
+" Om fasen är genomförd, sätts status till 'Klar'"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Slutdatum"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Aktivitetsdetaljer"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Varaktighet"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Projektanvändare"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Projektfas"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"För att schemalägga faserna för alla valda projekt. Efteråt visas en "
+"ganttvy.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Beräkna projektfaser"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Inte tillåtet med upprepningar i faser"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Resursavgångar"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Schemalägg aktiviteter"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Dagar som standard"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Tvinga anslutna användare"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Schemaläggning"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Visar inställningar"
-- 
cgit v1.2.3


From 501721883d488f6a6981bdb49ac112943d32001f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 21 Jun 2012 12:39:59 +0530
Subject: [USB] removed useless class defination

bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8891e5f777c..2dc5137b4ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
-                    <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
+                    <button string="Pending" name="set_pending" states="open" />
+                    <button string="Draft" name="set_draft" states="open" />
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From 55633a22a2ed4b5f06eab47429b339770a5d1170 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 22 Jun 2012 16:42:51 +0530
Subject: [REF] search views: removed filterr_domain if only one element was
 inside

bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 57f43c17e06..b527d511d5f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -272,7 +272,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
-                        <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Project Phases"/>
                         <separator orientation="vertical"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
-- 
cgit v1.2.3


From 07e5b120e608f43973c7250b831800ca637d2e5b Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 22 Jun 2012 17:16:01 +0530
Subject: [IMP] improved the view of project related modules

bzr revid: bde@tinyerp.com-20120622114601-58ivi12560qpw51l
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18babab66a4..8750c98728f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -212,7 +212,7 @@
                                     <field name="sequence"/>
                                 </group>
                             </group>
-                           <separator string="Force Assigned Users"/>
+                           <h2><label string="Force Assigned Users"/></h2> 
                            <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
@@ -325,7 +325,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 25 Jun 2012 05:15:09 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120623050212-tvzx03gj3h8f0ool
bzr revid: launchpad_translations_on_behalf_of_openerp-20120624052822-84nt172gva6prhqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120625051509-c432dvk4aqn3vjj9
---
 addons/project_long_term/i18n/mn.po | 529 ++++++++++++++++++++++++++++++++++++
 1 file changed, 529 insertions(+)
 create mode 100644 addons/project_long_term/i18n/mn.po

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
new file mode 100644
index 00000000000..77ffa6ef54b
--- /dev/null
+++ b/addons/project_long_term/i18n/mn.po
@@ -0,0 +1,529 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Дараагийн Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Төслийн Даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Оноогдсон Хэрэглэгчид"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Явц"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Боловсруулагдаж байгаа Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Тов"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Шатны Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Төсөл нь ялгаатай шатуудад хуваагдаж болно. Шат бүрт хэрэглэгчдийн "
+"хуваарьлалтыг хийж болно. Шатуудад даалгавруудыг онооно. Шатуудыг өмнөх, "
+"хойдох шаттай нь холбож болно. Шатуудад автомат товлолтыг хийх огнооны "
+"хяналтуудыг нэмэх боломжтой. Урт хугацааны төлөвлөлтийг байгаа хэрэглэгчид "
+"төлөвлөхдөө хэрэглэж төслийг эхлэхдээ шатуудыг бүлэг даалгаврууд руу "
+"хөрвүүлэх замаар эхлүүлнэ."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Нэг төслийг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Өмнөх Шатууд"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Х.Н (Хэмжих Нэгж) гэдэг нь үргэлжлэх хугацааг хэмжих нэгж юм."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Хэрэглэгчдийг Төлөвлөх"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Энэ нь эхлэх огноо, үргэлжлэх хугацааны дагуу товлогчоор тооцоологддог."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Дуусгах огноо"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Миний бүх төслийг тооцоолох"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Төслийн Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Холбогдох даалгавар дээр үндэслэн тооцоологдсон"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Үргэлжлэх Х.Н"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Хамгийн бага эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Нөөц"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Миний төслүүд"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Холбогдох даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Шинэ Шатууд"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Төслийн товийг зааж өгнө үү."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "шатыг энэ огнооны дараанаас хүчээр эхлүүлэх"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"төслийн эхлэх огноо эсвэл өмнөх шатын дуусах огнооны дагуу товлогчоор "
+"автоматаар энэ нь тооцоологддог."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Шатын эхлэх огноо нь дуусах огнооноос өмнө байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Эхлэх Сар"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "энэ огнооны өмнө шатыг хүчээр дуусгах"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Төсөл дахь нөөц нь товлогчоор автоматаар тооцоологдож болно."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Хүлээгдэж байгаа шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Төсөлийн Даалгавруудыг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Хяналт"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Шатуудын жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Төслийн шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Үлдсэн цаг"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Ажлын цаг"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Шатуудыг Товыг Гаргах"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Шатыг эхлэх"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Нийт цаг"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Шат"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Хэрэв шат үүсгэгдсэн бол төлөв нь 'Ноорог' болно.\n"
+" Хэрэв шат эхлэсэн бол төлөв нь 'Хийгдэж байна' болно.\n"
+" Хэрэв шат үзлэг хийгдэх хэрэгтэй бол 'Хүлээгдэж буй' төлөвтэй болно.        "
+"                          \n"
+" Хэрэв шат дууссан бол 'Хийгдсэн' төлөвтэй болно."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Даалгаврын Дэлгэрэнгүй"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Төслийн Хэрэглэгчид"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Төслийн Шат"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"Бүх төслийн эсвэл тухайлсан төслийн шатыг товыг гаргах. Дараа нь Гантт "
+"харагдацаар нээгдэнэ.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Төслийн Шатыг Тооцоолох"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Шатанд давталт зөвшөөрөгдөхгүй"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Нөөцийн Амралт, Чөлөө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Даалгавруудыг Товлох"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Анхныхаар өдрөөр"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Оноогдсон хэрэглэгчдийг албадах"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Товлох"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Харуулах Тохиргоо"
-- 
cgit v1.2.3


From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 25 Jun 2012 15:39:01 +0530
Subject: [IMP]Improve wizard button

bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 2 +-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 91d06bdb52b..4621aa2946e 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_editable" />
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index c42b3dbc674..309fe7e5c6f 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_editable" />
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From 91be67f77458d8d17d10a932b5e848e0b5a45ae3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 25 Jun 2012 18:06:35 +0530
Subject: [USA] remove red button class oe_highlight in module  project and
 contract for done and close button

bzr revid: rma@tinyerp.com-20120625123635-28qyp2scvwrd148d
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6d992a96cdc..aaee541c9e6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -144,7 +144,7 @@
                 <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
-                    <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open" />
                     <button string="Pending" name="set_pending" states="open" />
                     <button string="Draft" name="set_draft" states="open" />
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-- 
cgit v1.2.3


From db72c57687a9975c9e45362bb4d2c96343d8910c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 18:49:31 +0530
Subject: [IMP] project phase view change

bzr revid: kjo@tinyerp.com-20120625131931-i1bo061rk7215omo
---
 addons/project_long_term/project_long_term_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b527d511d5f..faa09eaed95 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,23 +151,24 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
+                    <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
                     </h2>
+                    </div>
                     <group>
-                        <group>
-                            <field name="date_start"/>
-                            <field name="date_end"/>
-                        </group><group>
-                            <label for="duration"/>
-                            <div>
-                                <field name="duration" class="oe_inline"/>
-                                <field name="product_uom"/>
-                            </div>
-                        </group>
+                    <label for="date_start" string="Duration"/>
+                    <div>
+                        <field name="date_start" nolabel="1" class="oe_inline"/>    -
+                        <field name="date_end" nolabel="1" class="oe_inline"/>
+                        <div>
+                        <field name="duration" nolabel="1" class="oe_inline"/>
+                        <field name="product_uom" nolabel="1" class="oe_inline"/>
+                        </div>
+                    </div>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
-- 
cgit v1.2.3


From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Tue, 26 Jun 2012 12:01:19 +0530
Subject: [IMP]Apply css class flow on wizards buttons

bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 2 +-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 4621aa2946e..2d84ae412c7 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_editable" />
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 309fe7e5c6f..32bae94b246 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_editable" />
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From deefa50354a7a3b7d2a305dafa38a0510a35cf3f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 19:23:23 +0530
Subject: [FIX] project* buton cancel

bzr revid: jam@tinyerp.com-20120627135323-r0v2agpm9rbghoao
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 4 +++-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 2d84ae412c7..341997a1952 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight_on_dirty"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 32bae94b246..7cf603f64d8 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight_on_dirty"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                      </header>
                      <group>
                          <field name="project_id"/>
-- 
cgit v1.2.3


From 1702b2335d7febda80f38846cec386053c0e41a0 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:10:05 +0530
Subject: [IMP]remove tabs and add spaces instead of them

bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
---
 addons/project_long_term/project_long_term_workflow.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml
index 3a821ddd274..317f98d9a35 100644
--- a/addons/project_long_term/project_long_term_workflow.xml
+++ b/addons/project_long_term/project_long_term_workflow.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-		<record id="wkf_phase" model="workflow">
+        <record id="wkf_phase" model="workflow">
             <field name="name">project.phase.wkf</field>
             <field name="osv">project.phase</field>
             <field name="on_create">True</field>
@@ -31,7 +31,7 @@
             <field name="action">set_cancel()</field>
         </record>
 
-		<record id="act_phase_pending" model="workflow.activity">
+        <record id="act_phase_pending" model="workflow.activity">
             <field name="wkf_id" ref="wkf_phase"/>
             <field name="name">set_pending</field>
             <field name="kind">function</field>
@@ -64,7 +64,7 @@
             <field name="signal">set_done</field>
         </record>
 
-		<record id="t3" model="workflow.transition">
+        <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_start_phase"/>
             <field name="act_to" ref="act_phase_pending"/>
             <field name="signal">set_pending</field>
@@ -106,5 +106,5 @@
             <field name="signal">set_draft</field>
         </record>
 
- 	</data>
+     </data>
 </openerp>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/project_long_term/wizard/project_compute_phases_view.xml | 2 +-
 addons/project_long_term/wizard/project_compute_tasks_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 341997a1952..8439244d717 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight_on_dirty"/>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
                           or
                          <button string="Cancel" class="oe_link" special="cancel" />
                       </header>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 7cf603f64d8..17779ffa268 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight_on_dirty"/>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
                          or
                         <button string="Cancel" class="oe_link" special="cancel" />
                      </header>
-- 
cgit v1.2.3


From 7c114fa26a0e5b8b4312f73f717a3274245b393a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 12:12:08 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629101208-fmfa4k5dgm818aqy
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e313f8944b2..ec575a514c1 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -145,9 +145,9 @@
                 <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
-                    <button string="Done" name="set_done" states="pending,open" />
-                    <button string="Pending" name="set_pending" states="open" />
-                    <button string="Draft" name="set_draft" states="open" />
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From 89f6e166755884de1fbbd58dbf02e90ea8908180 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 2 Jul 2012 18:37:25 +0200
Subject: [IMP] usability: form views

bzr revid: qdp-launchpad@openerp.com-20120702163725-14j93jkw3qtl8368
---
 addons/project_long_term/project_long_term_view.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eeec5f154fc..a98e9088402 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -153,22 +153,21 @@
                 </header>
                 <sheet>
                     <div class="oe_title">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                    </h2>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="project_id" class="oe_edit_only"/>
+                        <h2>
+                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                        </h2>
                     </div>
                     <group>
                     <label for="date_start" string="Duration"/>
                     <div>
-                        <field name="date_start" nolabel="1" class="oe_inline"/>    -
-                        <field name="date_end" nolabel="1" class="oe_inline"/>
                         <div>
-                        <field name="duration" nolabel="1" class="oe_inline"/>
-                        <field name="product_uom" nolabel="1" class="oe_inline"/>
+                            <field name="duration" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline"/>
                         </div>
+                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
-- 
cgit v1.2.3


From d259c314493548c34eab0ae3992872b723041e58 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 3 Jul 2012 16:15:59 +0530
Subject: [IMP]: product: Improved reference name for UoM hour and day to make
 it consistent with other demo reference name

bzr revid: rpa@tinyerp.com-20120703104559-3yew39vtv7ayop64
---
 addons/project_long_term/project_long_term_demo.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4cd6d5cdec4..51aef980753 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -14,7 +14,7 @@
         <record id="project_phase_1" model="project.phase">
             <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
             <field name="name">Collect Requirement and Make SRS</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
             <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
@@ -26,7 +26,7 @@
         <record id="project_phase_2" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
             <field name="name">Design Model</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -36,7 +36,7 @@
         <record id="project_phase_3" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
             <field name="name">Planning and compute Risk analysis, Time chart </field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -46,7 +46,7 @@
         <record id="project_phase_4" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -55,7 +55,7 @@
         <record id="project_phase_5" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_4')])]" name="previous_phase_ids"/>
             <field name="name">Review and Testing</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -64,7 +64,7 @@
         <record id="project_phase_6" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
             <field name="name">Deployement and Training</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="6" name="sequence"/>
             <field name="duration">10</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
-- 
cgit v1.2.3


From fd72bd3cd99502a513d425dbe80efe0954768a37 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 4 Jul 2012 13:12:47 +0530
Subject: [IMP]:Improve project view. put timesheet and all in one group

bzr revid: atp@tinyerp.com-20120704074247-c78ph5cpky9lfyr5
---
 addons/project_long_term/project_long_term_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 03946b20a2d..53b5a14cb71 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,11 +111,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                    <label for="use_phases"/>
+                    <div>
+                        <field name="use_phases"/>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/>
+                    </div>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From 5e7f7bef7bed54bc8f4f889720b3cde11915cf25 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 11:26:53 +0530
Subject: [FIX]: Set document button for project view.

bzr revid: atp@tinyerp.com-20120706055653-h546ptvo3b95yq6f
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53b5a14cb71..7035c559a14 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,7 +111,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                <xpath expr='//div[@name="Tasks"]' position='after'>
                     <label for="use_phases"/>
                     <div>
                         <field name="use_phases"/>
-- 
cgit v1.2.3


From 64a9321d56a6f6a46cf153eafa85fb065327b025 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 18:40:11 +0200
Subject: [IMP] footer on forms

bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
---
 .../project_long_term/wizard/project_compute_phases_view.xml   | 10 +++++-----
 addons/project_long_term/wizard/project_compute_tasks_view.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8439244d717..0d5c81984ba 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
-                          or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 17779ffa268..8eb9db762dd 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 0c4b5b5cf2ec6d94163c5010080bd8841241d6fc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 12 Jul 2012 16:46:00 +0200
Subject: [IMP] project.*: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120712144600-irb7zscuotkz4jsg
---
 .../project_long_term/project_long_term_view.xml   | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7035c559a14..7d7310465d6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,12 +111,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="Tasks"]' position='after'>
-                    <label for="use_phases"/>
-                    <div>
-                        <field name="use_phases"/>
-                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/>
-                    </div>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
                 </xpath>
             </field>
         </record>
@@ -156,20 +155,21 @@
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="project_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                        </h2>
                     </div>
                     <group>
-                    <label for="date_start" string="Duration"/>
-                    <div>
-                        <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
-                        </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
-                    </div>
+                        <group>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <div>
+                                    <field name="duration" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
@@ -209,10 +209,10 @@
                                <group>
                                     <field name="constraint_date_start"/>
                                     <field name="constraint_date_end"/>
-                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                                 <group>
                                     <field name="sequence"/>
+                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                             </group>
                            <separator string="Previous Phases"/>
-- 
cgit v1.2.3


From 339051cadf4b9af80c2671521fe0de7441714b4f Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 13 Jul 2012 14:43:24 +0530
Subject: [IMP] : Update Description for modules

bzr revid: cha@tinyerp.com-20120713091324-sengeariqawfira9
---
 addons/project_long_term/__openerp__.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 8ed12a06e10..b44bd92ad57 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -31,14 +31,18 @@
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
-Features
---------
+Features:
+---------
     * Manage Big project.
     * Define various Phases of Project.
-    * Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
-      If no project given then all the draft,open and pending state phases will be taken.
-    * Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks.
-    * Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
+    * Compute Phase Scheduling: Compute start date and end date of the phases
+      which are in draft, open and pending state of the project given. If no
+      project given then all the draft, open and pending state phases will be taken.
+    * Compute Task Scheduling: This works same as the scheduler button on
+      project.phase. It takes the project as argument and computes all the open,
+      draft and pending tasks.
+    * Schedule Tasks: All the tasks which are in draft,pending and open state
+      are scheduled with taking the phase's start date
     """,
     "init_xml": [],
     "demo_xml": ["project_long_term_demo.xml"],
-- 
cgit v1.2.3


From 71122ae47ac248053c84464d9307de89689b88f8 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 13 Jul 2012 15:47:51 +0530
Subject: [IMP]tooltip : I have changed the tooltip of fields as suggested

bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..7604d43af1b 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -114,7 +114,7 @@ class project_phase(osv.osv):
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
-            help="The ressources on the project can be computed automatically by the scheduler"),
+            help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
-- 
cgit v1.2.3


From 8028996327d4621874773e7561ea9a34971d4b7a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 14 Jul 2012 06:27:50 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
---
 addons/project_long_term/i18n/ar.po    |   4 +-
 addons/project_long_term/i18n/ca.po    |   4 +-
 addons/project_long_term/i18n/da.po    |   4 +-
 addons/project_long_term/i18n/de.po    |   4 +-
 addons/project_long_term/i18n/es.po    |   4 +-
 addons/project_long_term/i18n/es_CR.po |   4 +-
 addons/project_long_term/i18n/fi.po    |   4 +-
 addons/project_long_term/i18n/fr.po    |   4 +-
 addons/project_long_term/i18n/hr.po    |   4 +-
 addons/project_long_term/i18n/hu.po    |   4 +-
 addons/project_long_term/i18n/it.po    |   4 +-
 addons/project_long_term/i18n/ja.po    |   6 +-
 addons/project_long_term/i18n/lv.po    |   4 +-
 addons/project_long_term/i18n/mn.po    |   6 +-
 addons/project_long_term/i18n/nl.po    |  29 +++----
 addons/project_long_term/i18n/pl.po    |   4 +-
 addons/project_long_term/i18n/pt.po    |   8 +-
 addons/project_long_term/i18n/pt_BR.po |   4 +-
 addons/project_long_term/i18n/ro.po    | 145 +++++++++++++++++----------------
 addons/project_long_term/i18n/sv.po    |  10 +--
 addons/project_long_term/i18n/tr.po    |   4 +-
 addons/project_long_term/i18n/zh_CN.po |   4 +-
 22 files changed, 139 insertions(+), 129 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index af4189253b3..1fde1fa5bfe 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 2e748ee5a9c..96dbdee61b2 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 6533d8987db..da09ca4a6e8 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 12ecb8646e7..9e6d1d0cad1 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index f541e23c69a..b561c298f97 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index ca0a2c90f19..631089f1372 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 0a07c784311..150b5e1a7d1 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 632d62b39d7..4918f6d622b 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index bd4d578d6fa..412588662b1 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 434e279237c..d6d55a0e97a 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 669df55ed58..426d555e6e0 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index 3bdbd1f4961..bb8c6e70e60 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-11 04:46+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -490,7 +490,7 @@ msgstr "順序"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr "リソースの休暇"
+msgstr "休暇リソース"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 0673ffaded1..4328e44560a 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 77ffa6ef54b..7749c075ac6 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -526,4 +526,4 @@ msgid "Scheduling"
 msgstr "Товлох"
 
 #~ msgid "Displaying settings"
-#~ msgstr "Харуулах Тохиргоо"
+#~ msgstr "Тохиргоонууд харуулах"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index b41290182cd..91aaf24460b 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -42,7 +42,7 @@ msgstr "Groepeer op..."
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "Toegewezen egbruiker"
+msgstr "Toegewezen gebruiker"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -67,7 +67,7 @@ msgstr "Afbeeld instellingen"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr "Planning"
+msgstr "Planning berekenen"
 
 #. module: project_long_term
 #: constraint:project.task:0
@@ -141,7 +141,8 @@ msgstr "Planning voor gebruikers"
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
 msgstr ""
-" Het is berekend door de planning volgens de startdatum en de doorlooptijd."
+" Het is berekend door de taakplanner volgens de startdatum en de "
+"doorlooptijd."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -279,7 +280,7 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
-"Het is berekend door de planning volgens de project datum of de einddatum "
+"Het is berekend door de taakplanner volgens de project datum of de einddatum "
 "van de vorige fase."
 
 #. module: project_long_term
@@ -313,8 +314,8 @@ msgstr "de fase forceren te eindigen vóór deze datum"
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
 msgstr ""
-"The resources van een project kunnen worden automatisch worden berekend door "
-"de planner."
+"De resources van een project kunnen automatisch worden berekend door de "
+"taakplanner."
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -400,7 +401,7 @@ msgstr "Werktijd"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr "Geplande fases"
+msgstr "Bereken fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -508,7 +509,7 @@ msgstr "Afwezigheid resource"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr "Taken plannen"
+msgstr "Bereken taken"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
@@ -524,10 +525,7 @@ msgstr "Forceer gebruikerstoewijzing"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr "Planning"
-
-#~ msgid "Displaying settings"
-#~ msgstr "Afbeeld instellingen"
+msgstr "Planning berekenen"
 
 #~ msgid "Resources Allocation"
 #~ msgstr "Resource toewijzing"
@@ -645,3 +643,6 @@ msgstr "Planning"
 
 #~ msgid "Planning"
 #~ msgstr "Planning"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Weergave instellingen"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 288944e8f38..daa512c58ca 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index e1255b76366..061acc6c33d 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -208,7 +208,7 @@ msgstr "Estado"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "Computar"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -488,7 +488,7 @@ msgstr "Calcula fases do projeto"
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Não são permitidos ciclos fechados nas fases"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 56aacddfb06..0436a14b0d4 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index 3b176786b0c..3e436d115a1 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -26,7 +26,7 @@ msgstr "Etape"
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr "Etapele următoare"
+msgstr "Etapele urmatoare"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -37,29 +37,29 @@ msgstr "Sarcinile proiectului"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr ""
+msgstr "Utilizatori alocati"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
 msgid "Progress"
-msgstr "Desfășurare"
+msgstr "In desfasurare"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"Eroare! data de început a proiectului trebuie să fie mai mică decât data de "
-"sfârșit a proiectului."
+"Eroare! data de inceput a proiectului trebuie sa fie mai mica decat data de "
+"sfarsit a proiectului."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "In Progress Phases"
-msgstr ""
+msgstr "Etape in desfasurare"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -69,17 +69,17 @@ msgstr "Afisare setări"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr "Programează"
+msgstr "Programati"
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteți crea sarcini recursive."
+msgstr "Eroare ! Nu puteti crea sarcini recursive."
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Eroare! Nu puteți atribui o intensificare aceluiași proiect!"
+msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:126
@@ -90,12 +90,12 @@ msgstr "Zi"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Alocare Etapa Utilizator"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr "Sarcină"
+msgstr "Sarcina"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
@@ -107,11 +107,17 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Un proiect poate fi impartit in diferite etape. Pentru fiecare etapa, puteti "
+"sa definiti alocarea utilizatorului, sa descrieti diferite sarcini si sa "
+"legati etapa d-voastra la etapele anterioare si ulterioare, sa adaugati "
+"constrangeri de date pentru programarea automata. Utilizati planificarea pe "
+"termen lung pentru a planifica utilizatorii disponibili, a transforma "
+"etapele intr-o serie de sarcini atunci cand incepeti lucrul la proiect."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr "Calculează un Singur Proiect"
+msgstr "Calculati un Singur Proiect"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -122,7 +128,7 @@ msgstr "Etapele anterioare"
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr "UM (Unitatea de Măsură) este unitatea de măsurare a Duratei"
+msgstr "UdM (Unitatea de Masura) este unitatea de masurare a Duratei"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -130,15 +136,15 @@ msgstr "UM (Unitatea de Măsură) este unitatea de măsurare a Duratei"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Planificarea Utilizatorilor"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
 msgstr ""
-" Este calculat de către programator in functie de data de inceput si de "
-"durată."
+" Este calculat de catre programator in functie de data de inceput si de "
+"durata."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -161,28 +167,28 @@ msgstr "Eroare!"
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
 msgid "Ending Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr "Data scadentă"
+msgstr "Termen limita"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calculeaza toate Proiectele mele"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr "_Anulează"
+msgstr "_Anulati"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:141
@@ -193,7 +199,7 @@ msgstr " (copie)"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Alocare Utilizator Proiect"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -205,28 +211,28 @@ msgstr "Stare"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr "C_alculează"
+msgstr "C_alculati"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "New"
-msgstr "Nou"
+msgstr "Nou(a)"
 
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calculat pe baza sarcinilor asociate"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr "UM durată"
+msgstr "UdM durata"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr "Data minimă de început"
+msgstr "Data minima de inceput"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
@@ -242,7 +248,7 @@ msgstr "Proiectele mele"
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
@@ -252,23 +258,23 @@ msgstr "Sarcini asociate"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "New Phases"
-msgstr "Faze noi"
+msgstr "Etape noi"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Va rugam sa specificati un proiect de programat."
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr "impune inceperea etapei după această dată"
+msgstr "impune inceperea etapei dupa aceasta data"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr "Sarcini proiect"
+msgstr "Sarcini Proiect"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -276,7 +282,7 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
-"Este calculat de către programator in functie de data proiectului sau de "
+"Este calculat de catre programator in functie de data proiectului sau de "
 "data incheierii etapei precedente."
 
 #. module: project_long_term
@@ -288,45 +294,45 @@ msgstr "Luna"
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
 msgstr ""
-"Data de inceput a etapei trebuie să fie mai mică decat data de sfarsit."
+"Data de inceput a etapei trebuie saă fie mai mica decat data de sfarsit."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Month"
-msgstr "Lună start"
+msgstr "Inceput luna"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.user.allocation,date_start:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr "impune incheierea etapei inainte de această dată"
+msgstr "impune incheierea etapei inainte de aceasta data"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
-msgstr ""
+msgstr "Resursele din proiect pot fi calculate automat de catre programator"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr "Faze în așteptare"
+msgstr "Etape in asteptare"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr "În așteptare"
+msgstr "In asteptare"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -337,17 +343,17 @@ msgstr "Utilizator"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr "Calculează Sarcinile Proiectului"
+msgstr "Calculati Sarcinile Proiectului"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr "Constrângeri:"
+msgstr "Constrangeri"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr "Prezintă ordinea secventei atunci cand afisează o listă cu etape."
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista cu etape."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -368,25 +374,25 @@ msgstr "Efectuat"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr "În desfăsurare"
+msgstr "In curs de desfasurare"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr "Ore rămase"
+msgstr "Ore ramase"
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
-"Eroare ! Data de sfârșit a sarcinii trebuie să fie mai mare decât data de "
-"început"
+"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
+"inceput"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -398,12 +404,12 @@ msgstr "Program de lucru"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Programati Etapele"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr "Începe etapa"
+msgstr "Incepeti etapa"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -418,7 +424,7 @@ msgstr "Utilizatori"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Phase"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -429,17 +435,17 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
-"Dacă etapa este creată, starea este 'Ciornă'.\n"
-" Dacă etapa a inceput, starea devine 'In desfăsurare'.\n"
-" Dacă este necesară verificarea, starea este 'In asteptare'.                 "
+"Daca etapa este creata, starea este 'Ciorna'.\n"
+" Daca etapa a inceput, starea devine 'In desfasurare'.\n"
+" Daca este necesara verificarea, starea este 'In asteptare'.                 "
 "                   \n"
-" Dacă etapa este incheiată, starea este setată pe'Efectuat'."
+" Daca etapa este incheiata, starea este setata pe'Efectuat'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
 #: field:project.user.allocation,date_end:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project_long_term
 #: field:project.phase,name:0
@@ -449,7 +455,7 @@ msgstr "Nume"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr "Detalii sarcină"
+msgstr "Detalii sarcini"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
@@ -459,7 +465,7 @@ msgstr "Durata"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project Users"
-msgstr ""
+msgstr "Utilizatori Proiect"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -477,11 +483,14 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Pentru programarea etapelor tuturor proiectelor sau a unui anumit proiect. "
+"Apoi afiseaza o vizualizare a diagramei Gantt.\n"
+"               "
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr "Calculează Etapele Proiectului"
+msgstr "Calculati Etapele Proiectului"
 
 #. module: project_long_term
 #: constraint:project.phase:0
@@ -491,19 +500,19 @@ msgstr "Nu sunt permise bucle in etape"
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr "Concediu Resursă"
+msgstr "Resursa Concedii"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr "Programează Sarcini"
+msgstr "Programati Sarcini"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
@@ -514,7 +523,7 @@ msgstr "Implicit in zile"
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Impuneti Utilizatori Alocati"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -642,4 +651,4 @@ msgstr "Programare"
 #~ msgstr "Calculează toate proiectele"
 
 #~ msgid "Displaying settings"
-#~ msgstr "Afișare setări"
+#~ msgstr "Afisare setari"
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index c93e11abe4e..95cb9ef30ce 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -106,7 +106,7 @@ msgid ""
 "the project."
 msgstr ""
 "Ett projekt kan delas in i flera olika faser. Varje fas kan du definiera "
-"användares beläggning, beskriva olika aktivieteter och länka dina faser till "
+"användares beläggning, beskriva olika aktiviteter och länka dina faser till "
 "andra faser, datumregler för automatisk schemaläggning. Använd "
 "långtidsplanering för detaljplanera dina användares beläggning, konvertera "
 "dina faser till en serie av aktiviteter när projektarbetet verkligen kommer "
@@ -516,7 +516,7 @@ msgstr "Dagar som standard"
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr "Tvinga anslutna användare"
+msgstr "Nödvändiga projektdeltagare"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -524,4 +524,4 @@ msgid "Scheduling"
 msgstr "Schemaläggning"
 
 #~ msgid "Displaying settings"
-#~ msgstr "Visar inställningar"
+#~ msgstr "Vyinställningar"
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 416867cccb3..0ad5adf1c32 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 29363eacf2f..570bf983cb3 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
-- 
cgit v1.2.3


From 07ff3d4eaa318078ae2c297879a4cf3fd814e4f2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:25:00 +0530
Subject: [IMP] project_long_term: improved search view.

bzr revid: tpa@tinyerp.com-20120723065500-xzqgj4k9atke6d62
---
 .../project_long_term/project_long_term_view.xml   | 41 ++++++++--------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7d7310465d6..d60ffb88b21 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -69,17 +69,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
-                    <group>
-                       <field name="user_id"/>
-                       <field name="phase_id"/>
-                       <field name="project_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="phase_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
-                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -272,25 +268,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group>
-                        <field name="name" string="Project Phases"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <separator orientation="vertical"/>
-                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
-                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id"/>
-                    </group>
-                    <newline/> 
+                    <field name="name" string="Project Phases"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="project_id"/>
+                    <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
+                    <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>
-- 
cgit v1.2.3


From 6dcf691e70315d70a4a79845da51091866b6c77b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 11:53:03 +0530
Subject: [IMP] project_long_term : Override the 'on_change_template' method.

bzr revid: mdi@tinyerp.com-20120724062303-xoc4l9ye72x5lz3f
---
 addons/project_long_term/project_long_term.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..25aa98016e9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,6 +275,13 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_phases'] = template.use_phases
+        return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
-- 
cgit v1.2.3


From 930dd711ed9369e5a918d2df45878e5421001057 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 25 Jul 2012 04:52:31 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120725043706-7gh4e1622s0jedal
bzr revid: launchpad_translations_on_behalf_of_openerp-20120725045231-nh45u4rfluqv50oa
---
 addons/project_long_term/i18n/es_EC.po | 533 +++++++++++++++++++++++++++++++++
 1 file changed, 533 insertions(+)
 create mode 100644 addons/project_long_term/i18n/es_EC.po

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
new file mode 100644
index 00000000000..b00191d8a44
--- /dev/null
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -0,0 +1,533 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-07-24 16:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-25 04:37+0000\n"
+"X-Generator: Launchpad (build 15679)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Siguientes fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Usuarios asignados"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser menor que la fecha final "
+"del proyecto."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Fases en progreso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Planificar"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Error ! No puede crear tareas recursivas."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Asignación Fases de Usuario"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Un proyecto se puede dividir en diferentes fases. Para cada fase, se puede "
+"definir la asignación de usuarios, describir las diferentes tareas, vincular "
+"las fases previas y posteriores de una fase y añadir restricciones de fecha "
+"para la programación automática. Utilice la planificación a largo plazo con "
+"el fin de Planificar sus usuarios disponibles, convertir sus fases en una "
+"serie de tareas cuando se empiece a trabajar en el proyecto."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Calcular un sólo proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Fases previas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Planificación de Usuarios"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Es calculado por el planificador en función de la fecha de inicio y la "
+"duración"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Fecha de cierre"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Calcular todos los proyectos"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (copiar)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Asignación de usuarios a un proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "C_alcular"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Calculo basado en las tareas relacionadas"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "UdM duración"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Fecha de inicio mínima"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Mis Proyectos"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Tareas relacionadas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Nueva Fase"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Por favor, especifique un proyecto para planificar."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Forzar que la fase epiece después de esta fecha"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Es calculado por el planificador en función de la fecha inicio o fecha fin "
+"de la fase anterior"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "La fecha-inicio de la fase debe ser menor que la fecha-fin."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Mes de inicio"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Forzar que la fase termine antes de esta fecha"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+"Los Recursos del proyecto se puede calcular automáticamente por el "
+"planificador"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Fases pendientes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Calcular tareas del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Restricciones"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Indica el orden cuando se muestra la lista de fases"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Fases del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Planificación de fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Iniciar fase"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Si la fase se crea, el estado es \"Borrador\".\n"
+" Si la fase comienza, el estado cambia a \"En Proceso\".\n"
+" Si se necesita revisión, la fase está en estado \"Pendiente\".\n"
+" Si la fase está terminada, el estado se fija en \"z\"."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Fecha de finalización"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Detalles de tareas"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Usuarios del proyecto"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Fase del proyecto"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"Para planificar las fases en su totalidad o de un proyecto específico. "
+"Entonces, abra una vista de Gantt.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Calcular fases del proyecto"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "No se permiten bucles en fases"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Ausencia de recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Planificar tareas"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Por defecto en días"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Forzar asignación de usuarios"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificación"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Mostrando configuración"
-- 
cgit v1.2.3


From d92994caa6fb411a81462d0eb335227a1e4be7cb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 20:16:10 +0200
Subject: [IMP] remove a bunch of wtf comments in XML (horrifying things like
 === comment === or --- comment ---, without any XML comment tags) improve
 identation in a few files remove some spaces preceding closing tags

bzr revid: abo@openerp.com-20120725181610-oq0ug3u9t7fgpy3h
---
 .../project_long_term/project_long_term_view.xml   | 44 ++++++++--------------
 1 file changed, 16 insertions(+), 28 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7d7310465d6..099b09b9418 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,12 +2,9 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
-
-    # ------------------------------------------------------
-    # Project User Allocation
-    # ------------------------------------------------------
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
 
+        <!-- Project User Allocation -->
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
@@ -94,9 +91,7 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Phase
-    # ------------------------------------------------------
+        <!-- Project Phase -->
         <act_window id="act_project_phases"
             name="Phases"
             src_model="project.project"
@@ -182,7 +177,7 @@
                                   <form string="Project Users" version="7.0">
                                       <group col="4">
                                           <field name="user_id"/>
-                                          <field name="date_start" />
+                                          <field name="date_start"/>
                                           <field name="date_end"/>
                                       </group>
                                   </form>
@@ -195,7 +190,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="date_start"/>
-                                    <field name="date_end" />
+                                    <field name="date_end"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
@@ -285,7 +280,7 @@
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
                     </group>
-                    <newline/> 
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -317,10 +312,7 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Task
-    # ------------------------------------------------------
-
+        <!-- Project Task -->
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
@@ -368,16 +360,15 @@
             </field>
         </record>
 
-    <act_window
-        context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-        id="project_phase_task_list"
-        name="Related Tasks"
-        res_model="project.task"
-        src_model="project.phase"
-        view_mode="tree,form"
-        />
+        <act_window
+            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
+            id="project_phase_task_list"
+            name="Related Tasks"
+            res_model="project.task"
+            src_model="project.phase"
+            view_mode="tree,form"/>
 
-    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+        <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
@@ -393,10 +384,7 @@
             </field>
         </record>
 
-    # ------------------------------------------------------
-    # Menu Items
-    # ------------------------------------------------------
-
+        <!-- Menu Items -->
         <menuitem action="act_project_phase_list"
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
-- 
cgit v1.2.3


From cb1c6c08af0dad5380f1457a18d2cdb095a767bc Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Tue, 31 Jul 2012 16:58:04 +0530
Subject: [IMP]Improve search view in all modules

bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d60ffb88b21..ed63218e37b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -271,12 +271,12 @@
                     <field name="name" string="Project Phases"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="project_id"/>
                     <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                     <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                     <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                     <separator/>
                     <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-- 
cgit v1.2.3


From 3cfd65b43d53a37664752b949e6e98e19e57092e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 7 Aug 2012 05:39:28 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
---
 addons/project_long_term/i18n/ar.po    | 4 ++--
 addons/project_long_term/i18n/ca.po    | 4 ++--
 addons/project_long_term/i18n/da.po    | 4 ++--
 addons/project_long_term/i18n/de.po    | 4 ++--
 addons/project_long_term/i18n/es.po    | 4 ++--
 addons/project_long_term/i18n/es_CR.po | 4 ++--
 addons/project_long_term/i18n/es_EC.po | 4 ++--
 addons/project_long_term/i18n/fi.po    | 4 ++--
 addons/project_long_term/i18n/fr.po    | 4 ++--
 addons/project_long_term/i18n/hr.po    | 4 ++--
 addons/project_long_term/i18n/hu.po    | 4 ++--
 addons/project_long_term/i18n/it.po    | 4 ++--
 addons/project_long_term/i18n/ja.po    | 4 ++--
 addons/project_long_term/i18n/lv.po    | 4 ++--
 addons/project_long_term/i18n/mn.po    | 4 ++--
 addons/project_long_term/i18n/nl.po    | 4 ++--
 addons/project_long_term/i18n/pl.po    | 4 ++--
 addons/project_long_term/i18n/pt.po    | 4 ++--
 addons/project_long_term/i18n/pt_BR.po | 4 ++--
 addons/project_long_term/i18n/ro.po    | 4 ++--
 addons/project_long_term/i18n/sv.po    | 4 ++--
 addons/project_long_term/i18n/tr.po    | 4 ++--
 addons/project_long_term/i18n/zh_CN.po | 4 ++--
 23 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index 1fde1fa5bfe..e4859c5f75b 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 96dbdee61b2..afd8216df7d 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index da09ca4a6e8..5b6ce585453 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 9e6d1d0cad1..f53e34c0cb6 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index b561c298f97..82f0c276df8 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index 631089f1372..cd54b36536f 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index b00191d8a44..cec5a0f9a46 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-25 04:37+0000\n"
-"X-Generator: Launchpad (build 15679)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 150b5e1a7d1..e7209e67bde 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 4918f6d622b..c55e3582939 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index 412588662b1..c634626e1ed 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index d6d55a0e97a..a0721aa6bbf 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 426d555e6e0..31cca39375b 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index bb8c6e70e60..b6942982ae9 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 4328e44560a..50c53125eef 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 7749c075ac6..6a35bb779e4 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 91aaf24460b..0e84060aaba 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index daa512c58ca..bec5bb71d3e 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 061acc6c33d..7aca4caa234 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 0436a14b0d4..344a22a99e4 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index 3e436d115a1..cc92d00cbc6 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index 95cb9ef30ce..04a335c2a9a 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 0ad5adf1c32..3b286bfe63d 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 570bf983cb3..7f1c5ddf0d0 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
-- 
cgit v1.2.3


From 1dab436b8da6f1c2cd9d75ee538e43429f3e540c Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 7 Aug 2012 14:50:31 +0530
Subject: [IMP]: project*: Improved xml_id of demo project

bzr revid: rpa@tinyerp.com-20120807092031-xhwx7ei3equqw275
---
 addons/project_long_term/project_long_term_demo.xml | 18 +++++++++---------
 addons/project_long_term/test/phase_process.yml     |  4 ++--
 addons/project_long_term/test/task_process.yml      |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 51aef980753..fbe542f6462 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -5,7 +5,7 @@
         This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
         -->
 
-        <record id="project.project_integrate_openerp" model="project.project">
+        <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
@@ -18,7 +18,7 @@
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
             <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_1')]"/>
@@ -29,7 +29,7 @@
             <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_2')]"/>
         
@@ -39,7 +39,7 @@
             <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
 
@@ -49,7 +49,7 @@
             <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
@@ -58,7 +58,7 @@
             <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
@@ -67,7 +67,7 @@
             <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="6" name="sequence"/>
             <field name="duration">10</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_6')]"/>
@@ -146,9 +146,9 @@
         </record>
 
         <!-- run scheduling of phase -->
-        <!--<function model="project.project" name="schedule_phases" eval="(ref('project.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_phases" eval="(ref('project.project_project_1'),)"/>-->
         <!-- run scheduling of tasks -->
-        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_project_1'),)"/>-->
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/phase_process.yml b/addons/project_long_term/test/phase_process.yml
index 725c5b2a97d..8738834b103 100644
--- a/addons/project_long_term/test/phase_process.yml
+++ b/addons/project_long_term/test/phase_process.yml
@@ -5,7 +5,7 @@
 -
   !record {model: project.compute.phases, id: project_compute_phases01}:
     target_project: 'one'
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I schedule the phases.
 -
@@ -15,7 +15,7 @@
   I check the starting date and ending date on the phases after scheduling.
 -
   !python {model: project.project}: |
-     project = self.browse(cr, uid, ref("project.project_integrate_openerp"), context=context)
+     project = self.browse(cr, uid, ref("project.project_project_1"), context=context)
      def _convert(date):
         import time
         return time.strptime(date, '%Y-%m-%d %H:%M:%S')
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index 64ecef73476..a7065de315f 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -2,7 +2,7 @@
   I create a record to compute the tasks of project.
 -
   !record {model: project.compute.tasks, id: project_compute_tasks0}:
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I compute and shedule the tasks.
 -
@@ -12,7 +12,7 @@
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.project}: |
-    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
         if task.state in ('done','cancelled'):
             continue
-- 
cgit v1.2.3


From 24f97099d3ab1ed852f5d70def0bcd0e287f252c Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 8 Aug 2012 16:02:12 +0530
Subject: [FIX]: project_long_term: Fixed demo for scheduling phases was
 breaking

bzr revid: rpa@tinyerp.com-20120808103212-t3pfcy8uule2xun0
---
 .../project_long_term/project_long_term_demo.xml   | 48 +---------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index fbe542f6462..bca8231fdaa 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -90,58 +90,14 @@
         </record>
 
         <record id="project.project_task_5" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
         <record id="project.project_task_6" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_5"/>
         </record>
 
         <record id="project.project_task_7" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_8" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_9" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_10" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_11" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_12" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_13" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_14" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_15" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_16" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_17" model="project.task">
-            <field name="phase_id" ref="project_phase_6"/>
-        </record>
-
-        <record id="project.project_task_18" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
-- 
cgit v1.2.3


From fc1b1749a8c45d1ee84102fa408666436f47fb37 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 9 Aug 2012 11:35:16 +0530
Subject: [IMP]Remove type field from the modules

bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
---
 addons/project_long_term/project_long_term_view.xml     | 17 -----------------
 .../wizard/project_compute_phases_view.xml              |  1 -
 .../wizard/project_compute_tasks_view.xml               |  1 -
 3 files changed, 19 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3b814cbab6e..b4b98e8fe4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -8,7 +8,6 @@
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt date_start="date_start" date_stop="date_end" default_group_by="user_id">
               </gantt>
@@ -18,7 +17,6 @@
         <record id="view_project_user_allocation_calendar" model="ir.ui.view">
             <field name="name">project.user.allocation.calendar</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
@@ -32,7 +30,6 @@
         <record id="view_project_user_allocation_form" model="ir.ui.view">
             <field name="name">project.user.allocation.form</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
@@ -49,7 +46,6 @@
         <record id="view_project_user_allocation_list" model="ir.ui.view">
             <field name="name">project.user.allocation.list</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
@@ -63,7 +59,6 @@
        <record id="view_project_user_allocation_search" model="ir.ui.view">
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <field name="user_id"/>
@@ -99,7 +94,6 @@
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
@@ -114,7 +108,6 @@
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -131,7 +124,6 @@
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
@@ -220,7 +212,6 @@
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
@@ -237,7 +228,6 @@
         <record id="view_project_phase_calendar" model="ir.ui.view">
             <field name="name">project.phase.calendar</field>
             <field name="model">project.phase</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
@@ -249,7 +239,6 @@
         <record id="view_project_phase_gantt" model="ir.ui.view">
             <field name="name">project.phase.gantt</field>
             <field name="model">project.phase</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_stop="date_end" date_start="date_start" default_group_by="project_id">
@@ -260,7 +249,6 @@
         <record id="view_project_phase_search" model="ir.ui.view">
             <field name="name">project.phase.search</field>
             <field name="model">project.phase</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <field name="name" string="Project Phases"/>
@@ -305,7 +293,6 @@
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
@@ -316,7 +303,6 @@
         <record id="view_phase_task_search_form" model="ir.ui.view">
             <field name="name">phase.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
@@ -328,7 +314,6 @@
          <record id="view_phase_task_search_form_group" model="ir.ui.view">
             <field name="name">phase.task.search.form.group</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
@@ -340,7 +325,6 @@
          <record id="view_phase_task_search_form_tree" model="ir.ui.view">
             <field name="name">phase.task.search.form.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
@@ -360,7 +344,6 @@
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 0d5c81984ba..c9fcf5aca70 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_phases_select" model="ir.ui.view">
             <field name="name">Schedule Phases</field>
             <field name="model">project.compute.phases</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 8eb9db762dd..8b807806cde 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_tasks" model="ir.ui.view">
             <field name="name">Schedule Tasks</field>
             <field name="model">project.compute.tasks</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <group>
-- 
cgit v1.2.3


From b040d2706d6921a22b13f70e6f0689dba8399193 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 17 Aug 2012 16:45:40 +0530
Subject: [IMP]update __openerp__.py in all modules

bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
---
 addons/project_long_term/__openerp__.py | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 3882eddbdb5..d173e2a9b1c 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 {
-    "name": "Long Term Projects",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
-    "depends": ["project"],
-    "description": """
+    'name': 'Long Term Projects',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'images': ['images/project_phase_form.jpeg','images/project_phases.jpeg', 'images/resources_allocation.jpeg'],
+    'depends': ['project'],
+    'description': """
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
@@ -44,18 +44,18 @@ Features:
     * Schedule Tasks: All the tasks which are in draft, pending and open state
       are scheduled with taking the phase's start date.
     """,
-    "init_xml": [],
-    "demo_xml": ["project_long_term_demo.xml"],
-    "test": [
+    'data': [],
+    'demo': ['project_long_term_demo.xml'],
+    'test': [
           'test/phase_process.yml',
           'test/task_process.yml',
     ],
-    "update_xml": [
-        "security/ir.model.access.csv",
-        "project_long_term_view.xml",
-        "project_long_term_workflow.xml",
-        "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml",
+    'data': [
+        'security/ir.model.access.csv',
+        'project_long_term_view.xml',
+        'project_long_term_workflow.xml',
+        'wizard/project_compute_phases_view.xml',
+        'wizard/project_compute_tasks_view.xml',
     ],
     'installable': True,
     'auto_install': False,
-- 
cgit v1.2.3


From 8f9f8603232fc7a0bbd55fd83471c6f61184591a Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 20 Aug 2012 18:26:44 +0530
Subject: [IMP]Update __openerp__.py for all modules

bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
---
 addons/project_long_term/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_long_term')

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index d173e2a9b1c..2968a5b035d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -44,7 +44,6 @@ Features:
     * Schedule Tasks: All the tasks which are in draft, pending and open state
       are scheduled with taking the phase's start date.
     """,
-    'data': [],
     'demo': ['project_long_term_demo.xml'],
     'test': [
           'test/phase_process.yml',
-- 
cgit v1.2.3