Skip to content

Commit 908353d

Browse files
authored
Merge pull request #20555 from opf/merge-release/16.5-20251008034048
Merge release/16.5 into dev
2 parents ba1b425 + 1991826 commit 908353d

File tree

175 files changed

+546
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+546
-198
lines changed

.github/workflows/docs.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
contents: read
1414

1515
jobs:
16-
docs-check:
16+
docs-links-check:
1717
name: Check internal links in documentation
1818
runs-on: [ubuntu-latest]
1919
steps:
@@ -22,3 +22,18 @@ jobs:
2222
with:
2323
bundler-cache: true
2424
- run: bundle exec ./script/docs/check_links
25+
docs-readme-case-check:
26+
name: Check README.md case in documentation
27+
runs-on: [ubuntu-latest]
28+
steps:
29+
- uses: actions/checkout@v5
30+
- run: script/docs/check_readme_case
31+
docs-readme-yaml-header-syntax-check:
32+
name: Check README.md YAML header syntax in documentation
33+
runs-on: [ubuntu-latest]
34+
steps:
35+
- uses: actions/checkout@v5
36+
- uses: ruby/setup-ruby@v1
37+
with:
38+
bundler-cache: true
39+
- run: script/docs/check_readme_yaml_header_syntax

app/forms/custom_fields/hierarchy/item_form.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ItemForm < ApplicationForm
4141
value: @target_item.label,
4242
visually_hide_label: true,
4343
required: true,
44-
autofocus: true,
44+
autofocus: @target_item.errors.empty?,
4545
placeholder: I18n.t("custom_fields.admin.items.placeholder.label"),
4646
validation_message: validation_message_for(:label)
4747
)

app/models/exports/formatters/default.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ def format_options
7979
{}
8080
end
8181

82+
def currency_format
83+
"#,##0.00 [$#{Setting.costs_currency}]"
84+
end
85+
86+
def number_format
87+
"0.00"
88+
end
89+
8290
protected
8391

8492
# By default, use try as a non-destructive accessor
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# frozen_string_literal: true
2+
3+
#-- copyright
4+
# OpenProject is an open source project management software.
5+
# Copyright (C) the OpenProject GmbH
6+
#
7+
# This program is free software; you can redistribute it and/or
8+
# modify it under the terms of the GNU General Public License version 3.
9+
#
10+
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
11+
# Copyright (C) 2006-2013 Jean-Philippe Lang
12+
# Copyright (C) 2010-2013 the ChiliProject Team
13+
#
14+
# This program is free software; you can redistribute it and/or
15+
# modify it under the terms of the GNU General Public License
16+
# as published by the Free Software Foundation; either version 2
17+
# of the License, or (at your option) any later version.
18+
#
19+
# This program is distributed in the hope that it will be useful,
20+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
# GNU General Public License for more details.
23+
#
24+
# You should have received a copy of the GNU General Public License
25+
# along with this program; if not, write to the Free Software
26+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
27+
#
28+
# See COPYRIGHT and LICENSE files for more details.
29+
#++
30+
31+
module WorkPackage::Exports
32+
module Formatters
33+
class WorkHours < ::Exports::Formatters::Default
34+
def self.apply?(name, export_format)
35+
%i[estimated_hours remaining_hours].include?(name.to_sym) && export_format == :csv
36+
end
37+
38+
def format_options
39+
{ number_format: }
40+
end
41+
end
42+
end
43+
end

config/initializers/export_formats.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
formatter WorkPackage, WorkPackage::Exports::Formatters::Hours
4949
formatter WorkPackage, WorkPackage::Exports::Formatters::ProjectPhase
5050
formatter WorkPackage, WorkPackage::Exports::Formatters::SpentUnits
51+
formatter WorkPackage, WorkPackage::Exports::Formatters::WorkHours
5152

5253
list Project, Projects::Exports::CSV
5354
list Project, Projects::Exports::PDF

docs/project-management-guide/1-introduction/readme.md renamed to docs/project-management-guide/1-introduction/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
sidebar_navigation:
3-
title: 1 An Introduction to the PM² Guide - OpenProject
3+
title: 1 Introduction
44
priority: 999
55
description: Explains the purpose and audience of the PM² methodology. It introduces PM² as a light, practical, and adaptable approach suitable for various project types, developed by the European Commission. It outlines the structure of the guide and how to use it.
66
keywords: user guide
77
---
88

9-
# 1 An Introduction to the PM² Guide
9+
# 1 An introduction to the PM² guide
1010

1111
## 1.1 Objectives
1212

1313
This guide sets out to provide an introduction to the PM² Project Management Methodology. It has been kept as lean as possible, while still providing enough information to allow for an effective understanding of the PM² Methodology as practitioners start to use it.
1414

15-
## 1.2 Intended Audience
15+
## 1.2 Intended audience
1616

1717
- Entry-level Project Managers (PMs) and project teams wishing to learn more about project management and the PM² Methodology.
1818
- Experienced Project Managers (PMs) and team members who wish to learn more about the PM² Methodology.
@@ -23,11 +23,11 @@ This guide sets out to provide an introduction to the PM² Project Management Me
2323
- a common vocabulary (glossary) which makes it easier for project teams to communicate and apply project management concepts
2424
- best practices-it is up to the Project Managers (PMs) and project teams to choose the PM² practices that will bring most value to their projects
2525
- links to PM² resources (online resources, Artefact templates and examples)
26-
- an introduction to other PM² models, such as PM2-Agile, PM²-PgM (for Programme Management) and PM²-PfM (for Portfolio Management).
26+
- an introduction to other PM² models, such as PM²-Agile, PM²-PgM (for Programme Management) and PM²-PfM (for Portfolio Management).
2727

2828
This guide can be read from beginning to end, to learn about the methodology, or it can be used as a reference, to help you as you practise PM².
2929

30-
## 1.3 About the PM² Methodology
30+
## 1.3 About the PM² methodology
3131

3232
PM² is a Project Management Methodology developed by the European Commission. Its purpose is to enable Project Managers (PMs) to deliver solutions and benefits to their organisations by effectively managing the entire lifecycle of their project. PM² has been created with the needs of European Union Institutions and projects in mind, however, the best practices described in PM² are applicable to projects in any organisation.
3333
PM² is a light and easy-to-implement methodology which project teams can tailor to their specific needs. PM² is fully supported by a comprehensive training programme (including workshops and coaching sessions), online documentation and an active Community of Practice (currently only available within the European Commission and to a number of affiliate European Institutions).
@@ -51,11 +51,11 @@ PM² incorporates elements from a wide range of globally accepted project manage
5151
- proposing management activities and outputs (plans, meetings, decisions)
5252
- providing a link to agile practices.
5353

54-
## 1.4 The Centre of Excellence in PM² (CoEPM²)
54+
## 1.4 The Centre of excellence in PM² (CoEPM²)
5555

5656
The purpose of the Centre of Excellence in PM² (CoEPM² is to provide the European Commission and European Union Institutions with high-quality project management infrastructure, support and consulting services. The CoEPM² supports the PM² Methodology internally, coordinates an inter-institutional Project Support Network, and promotes the wider adoption and use of PM² beyond the European Union Institutions through the Open PM² initiative and the Digital Europe Programme.
5757

58-
## 1.5 The Open PM² Initiative
58+
## 1.5 The Open PM² initiative
5959

6060
Open PM² is a European Commission initiative, which brings the PM² Methodology and its benefits closer to its broader stakeholders and user community.
6161

@@ -79,7 +79,7 @@ Opening PM² does this by:
7979
- enabling the improved monitor and control of European Union-funded projects and grants
8080
- applying the European Commission decision of 12 December 2011 (2011/833/EU) on the reuse of Commission documents to promote accessibility and reuse.
8181

82-
### 1.5.1 PM² Publications
82+
### 1.5.1 PM² publications
8383

8484
The Centre of Excellence in PM² (CoEPM²) provides a central online location for all PM² information, and resources.
8585

docs/project-management-guide/2-project-management/readme.md renamed to docs/project-management-guide/2-project-management/README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
sidebar_navigation:
3-
title: 1 Project management
3+
title: 2 Project management
44
priority: 950
55
description: Provides the general project management concepts on which PM² is built. It covers the definition of projects, their environment, key success factors, and essential project management competencies (knowledge, skills, and mindsets).
66
keywords: user guide
@@ -84,15 +84,15 @@ The table below illustrates this with a simple example:
8484
| Project Outcomes | - Increased project quality. <br> - Improved visibility of project objectives, status and forecasts. <br> - Capability to have better control over contractor work and deliverables. |
8585
| Project Benefits | - Project cost overruns decreased by 30\% <br> - Productivity increased by 30\%. |
8686

87-
## 2.2 About Project Management
87+
## 2.2 About project management
8888

89-
### 2.2.1 What is Project Management?
89+
### 2.2.1 What is project management?
9090

91-
Project Management can be described as the activities of planning, organising, securing, monitoring and managing the resources and work necessary to deliver specific project goals and objectives in an effective and efficient way.
91+
Project management can be described as the activities of planning, organising, securing, monitoring and managing the resources and work necessary to deliver specific project goals and objectives in an effective and efficient way.
9292

9393
The project management approach used should always be tailored to the needs of the project. When using PM², a Project Manager (PM) should use (and if needed after tailoring) only those parts that contribute to the effective management of their project.
9494

95-
### 2.2.2 Project Documentation
95+
### 2.2.2 Project documentation
9696

9797
Project documentation is a key activity in project management. It carries through from the start of a project to its completion. Project documentation:
9898

@@ -121,13 +121,13 @@ A Project Support Office (PSO) is an organisational body (or entity) that provid
121121
- tailor the project management methodology to new best practices and help project teams implement the updated methodology effectively.
122122

123123

124-
### 2.2.4 Programme Management
124+
### 2.2.4 Programme management
125125

126126
A programme is a set of related projects and activities managed in a coordinated way to achieve strategic objectives and benefits that could not be obtained if they were managed individually. The projects within a programme all contribute to the common programme goals and are interdependent. In addition to projects, a programme often includes elements of related work (programme-level activities) outside the scope of its projects.
127127

128128
Programme management is different from multi-project management (managing many projects in parallel). Thus, while a Programme Manager ( PgM ) coordinates efforts between projects, s/he does not directly manage the individual projects.
129129

130-
### 2.2.5 Project Portfolio Management
130+
### 2.2.5 Project portfolio management
131131

132132
A project portfolio is a collection of projects, programmes and other activities, which are grouped together to allow better control over their financial and other resources and to facilitate their effective management
133133

@@ -136,7 +136,7 @@ in terms of meeting strategic objectives. The projects or programmes in a portfo
136136
It is very important for people involved in project definition and management to understand the differences between-and specific management requirements of-projects, programmes and portfolios. They should also be able to define or position their work at the right level (i.e. know if their work would be better managed as a programme or a network of projects), while always being aware of the management and organisational context of their work (see Appendix D).
137137
![Fig 2.4 Relationships between strategy, project, programme, portfolio and operations](02.04.png)
138138

139-
### 2.2.6 Projects vs Operations
139+
### 2.2.6 Projects vs operations
140140

141141
Projects are temporary and should therefore have a definite start and end. A project should be considered complete when it is determined that its goals and objectives have been accomplished. Once this happens, the project team should be disbanded.
142142

@@ -154,27 +154,27 @@ How do you recognise that a project has slipped into operations mode?
154154
- Maintenance activities are undertaken.
155155
- Minor updates (improvements) are planned and implemented over time.
156156

157-
## 2.3 Project Environment
157+
## 2.3 Project environment
158158

159-
### 2.3.1 Project Organisation
159+
### 2.3.1 Project organisation
160160

161161
It would be convenient to assume that all PM² Project Managers (PMs) operate within their organisations in a homogenous environment and with consistent levels of authority and responsibility. This is generally not the case, however.
162162

163163
There are typically several ways of organising projects within an organisation, which utilise one of the following structures or a combination of them.
164164

165-
**The Functional Structure**
165+
**The functional structure**
166166

167167
In a functional organisational structure, project work is integrated into the work performed by the permanent organisation. Project members and other resources are borrowed from multiple sections of the functional organisation. The Project Manager (PM) tends to have limited authority and needs to involve senior management in the management of important project issues. Project work is often viewed as having lower priority than everyday work.
168168

169-
**The Projectized Structure**
169+
**The projectized structure**
170170

171171
On the other end of the spectrum, in a projectized organisation, there is only a basic permanent (functional) hierarchy, and all work is organised and performed within temporary project organisations. Project resources are brought together specifically for the purpose of a project and work more or less exclusively for the project. At the end of the project, resources are either reassigned to another project or returned to a resource pool.
172172

173-
**The Matrix Structure**
173+
**The matrix structure**
174174

175175
A matrix organisation is a blended organisational structure. Additional temporary project organisations are created alongside the functional hierarchy to achieve specific project goals and work. The role of the Project Manager (PM) is recognised as central and key to the project's success, and the Project Steering Committee (PSC) typically delegates enough authority and responsibility to the Project Manager (PM) and the Business Manager (BM) for them to manage the project and its resources. Matrix organisations can be further categorised as weak, balanced and strong matrix organisations, the difference being the level of authority and autonomy given to the project organisation.
176176

177-
### 2.3.2 Developing Project Management Competences
177+
### 2.3.2 Developing project management competences
178178

179179
Project management involves much more than creating schedules and budgets, and Project Managers (PMs) must have a wide range of technical and behavioural skills at their disposal.
180180

@@ -193,7 +193,7 @@ It is up to the Project Manager (PM) to acquire these skills and invest in their
193193

194194

195195

196-
### 2.3.3 Project Management Competences
196+
### 2.3.3 Project management competences
197197

198198
Project Managers (PMs) need to:
199199

docs/project-management-guide/3-overview-pm2/readme.md renamed to docs/project-management-guide/3-overview-pm2/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
sidebar_navigation:
3-
title: 3 Overview of the PM² Methodology
3+
title: 3 PM² methodology overview
44
priority: 850
5-
description: Presents the House of PM² framework and explains its four pillars: Governance, Lifecycle, Processes, and Artefacts, all supported by PM² Mindsets. It introduces the four project lifecycle phases (Initiating, Planning, Executing, Closing) and explains tailoring to different project contexts.
5+
description: "Presents the House of PM² framework and explains its four pillars: Governance, Lifecycle, Processes, and Artefacts, all supported by PM² Mindsets. It introduces the four project lifecycle phases (Initiating, Planning, Executing, Closing) and explains tailoring to different project contexts."
66
---
77

8-
# 3 Overview of the PM² Methodology
8+
# 3 Overview of the PM² methodology
99

10-
## 3.1 The House of PM²
10+
## 3.1 The house of PM²
1111

1212
The PM² Methodology is built on Project Management best practices and is supported by four pillars:
1313

@@ -22,7 +22,7 @@ The PM² Methodology is built on Project Management best practices and is suppor
2222

2323
The spirit of the PM² Methodology is further defined by the PM² Mindsets, which provide the glue that holds together the PM² practices and provide a common set of beliefs and values for PM² project teams.
2424

25-
## 3.2 The PM² Lifecycle
25+
## 3.2 The PM² lifecycle
2626

2727
The PM² project lifecycle has four sequential and non-overlapping phases with a different type of activity predominant in each phase (i.e. initiating activities are predominant in the Initiating Phase, etc.). However, while phase-related activities peak in terms of effort during a specific phase, activities of this type can also be executed during neighbouring phase(s) (e.g. planning activities are also repeated in the Executing Phase).
2828

@@ -59,7 +59,7 @@ The Business Case and Project Charter define the project's scope and direction.
5959

6060
At the end of the Initiating Phase, the Project Steering Committee (PSC) or other Appropriate Governance Body (AGB) reviews the above documents and decides whether to allow the project to move forward.
6161

62-
### 3.2.2 Planning Phase
62+
### 3.2.2 Planning Phase
6363

6464
![Planning Phase](03.02.02.png)
6565

@@ -100,7 +100,7 @@ The following activities are part of the Executing Phase:
100100

101101
Once the project deliverables have been accepted by the Project Owner (PO), the Project Manager (PM) can request approval to move on to the Closing Phase. This decision to move on is taken by the Project Steering Committee (PSC).
102102

103-
### 3.2.4 Closing Phase
103+
### 3.2.4 Closing Phase
104104

105105
![Closing Phase](03.02.04.png)
106106

@@ -128,7 +128,7 @@ Monitor \& Control activities run throughout the project's lifecycle. During Mon
128128

129129

130130

131-
### 3.2.6 Phase Gates and Approvals
131+
### 3.2.6 Phase Gates and Approvals
132132

133133
At the end of each phase, the project passes through a review and approval gate. This ensures that the project is reviewed by the appropriate people (i.e. the Project Manager (PM), Project Owner (PO), the Project Steering Committee (PSC) or other delegated role) before it moves on to the next phase. These checkpoints contribute to the overall project management quality and allow the project to proceed in a more controlled way.
134134

@@ -162,7 +162,7 @@ Finally, the Closing Phase is driven by the stakeholders who evaluate the projec
162162
| Project Deliverables | Lists the complete set of project deliverables as defined in the Project <br> Charter and Project Work Plan. |
163163
| Project-End Report | Summarises the project experience, project performance and Lessons <br> Learned (successful project practices and potential pitfalls). |
164164

165-
## 3.4 What is a PM² Project
165+
## 3.4 What is a PM² Project
166166

167167
Many PM² best practices can be applied to any type of project or work activity. However, to be able to apply the whole PM² Methodology, a project must have certain characteristics.
168168

@@ -183,7 +183,7 @@ Thus, a PM² project:
183183

184184
The number of the above characteristics, apparent in a project, drive the tailoring and customization that will have to be applied to the PM² methodology.
185185

186-
## 3.5 PM² Mindsets
186+
## 3.5 PM² Mindsets
187187

188188
The PM² processes, artefacts, tools and techniques help project teams make decisions on trade-offs between a project's time, cost, scope and quality dimensions.
189189

@@ -227,7 +227,7 @@ The PM² Mindsets:
227227
- are useful reminders of effective attitudes and behaviours.
228228

229229

230-
## 3.6 Tailoring and Customisation
230+
## 3.6 Tailoring and Customisation
231231

232232
To ensure that the PM² Methodology effectively serves an organisation's and a project's needs, some level of tailoring or/and customisation may be required.
233233

docs/project-management-guide/4-project-organisation-and-roles/readme.md renamed to docs/project-management-guide/4-project-organisation-and-roles/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
sidebar_navigation:
3-
title: 4 Project Organisation and Roles
3+
title: 4 Project organisation and roles
44
priority: 800
55
description: Describes the PM² governance model in detail, including the main project roles and responsibilities for example the Project Steering Committee, Project Owner, Business Manager, Project Manager, and Project Core Team. It explains reporting lines, decision-making, and escalation mechanisms.
66
keywords: project stakeholders, project organisations, appropriate governance body, project steering committee, PSC, project owner, business manager, project manager, business implementation group, project core team, project support team, ram

0 commit comments

Comments
 (0)