Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lefilament_projets
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Le Filament
lefilament_projets
Commits
e01a862a
Commit
e01a862a
authored
7 years ago
by
Benjamin
Browse files
Options
Downloads
Patches
Plain Diff
modif config parameter
parent
6d93104c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
models/lefilament_projets.py
+2
-2
2 additions, 2 deletions
models/lefilament_projets.py
models/res_config.py
+9
-1
9 additions, 1 deletion
models/res_config.py
with
11 additions
and
3 deletions
models/lefilament_projets.py
+
2
−
2
View file @
e01a862a
...
@@ -23,7 +23,7 @@ class FilamentProjet(models.Model):
...
@@ -23,7 +23,7 @@ class FilamentProjet(models.Model):
@api.one
@api.one
def
_taux_horaire
(
self
):
def
_taux_horaire
(
self
):
lf_heures_jour
=
self
.
env
[
'
project.config.settings
'
].
search
([],
limit
=
1
,
order
=
'
id desc
'
).
lf_heures_jour
lf_heures_jour
=
self
.
env
[
'
ir.values
'
].
get_default
(
'
project.config.settings
'
,
'
lf_heures_jour
'
)
self
.
lf_taux_horaire
=
self
.
lf_tarif_jour
/
lf_heures_jour
self
.
lf_taux_horaire
=
self
.
lf_tarif_jour
/
lf_heures_jour
@api.one
@api.one
...
@@ -64,7 +64,7 @@ class FilamentProjet(models.Model):
...
@@ -64,7 +64,7 @@ class FilamentProjet(models.Model):
@api.one
@api.one
def
_total_heures
(
self
):
def
_total_heures
(
self
):
lf_heures_jour
=
self
.
env
[
'
project.config.settings
'
].
search
([],
limit
=
1
,
order
=
'
id desc
'
).
lf_heures_jour
lf_heures_jour
=
self
.
env
[
'
ir.values
'
].
get_default
(
'
project.config.settings
'
,
'
lf_heures_jour
'
)
if
(
self
.
lf_tarif_jour
!=
0.0
):
if
(
self
.
lf_tarif_jour
!=
0.0
):
self
.
lf_heures_projet
=
(
self
.
lf_heures_budget
/
self
.
lf_tarif_jour
)
*
lf_heures_jour
self
.
lf_heures_projet
=
(
self
.
lf_heures_budget
/
self
.
lf_tarif_jour
)
*
lf_heures_jour
else
:
else
:
...
...
This diff is collapsed.
Click to expand it.
models/res_config.py
+
9
−
1
View file @
e01a862a
...
@@ -8,8 +8,16 @@ class ProjectLFConfiguration(models.TransientModel):
...
@@ -8,8 +8,16 @@ class ProjectLFConfiguration(models.TransientModel):
lf_heures_jour
=
fields
.
Float
(
'
Heures / Jour
'
,
help
=
"
Base de temps pour le calcul du nombre d
'
heures vendues par projet (7h par défaut)
"
,
default
=
7.0
)
lf_heures_jour
=
fields
.
Float
(
'
Heures / Jour
'
,
help
=
"
Base de temps pour le calcul du nombre d
'
heures vendues par projet (7h par défaut)
"
,
default
=
7.0
)
@api.multi
def
set_default_lf_heures_jour
(
self
):
check
=
self
.
env
.
user
.
has_group
(
'
base.group_system
'
)
Values
=
check
and
self
.
env
[
'
ir.values
'
].
sudo
()
or
self
.
env
[
'
ir.values
'
]
for
config
in
self
:
Values
.
set_default
(
'
project.config.settings
'
,
'
lf_heures_jour
'
,
config
.
lf_heures_jour
)
@api.multi
@api.multi
def
get_default_lf_heures_jour
(
self
,
field
):
def
get_default_lf_heures_jour
(
self
,
field
):
lf_heures_jour
=
self
.
env
[
'
project.config.settings
'
].
search
([],
limit
=
1
,
order
=
'
id desc
'
).
lf_heures_jour
lf_heures_jour
=
self
.
env
[
'
ir.values
'
].
get_default
(
'
project.config.settings
'
,
'
lf_heures_jour
'
)
return
{
'
lf_heures_jour
'
:
lf_heures_jour
if
lf_heures_jour
else
7.0
}
return
{
'
lf_heures_jour
'
:
lf_heures_jour
if
lf_heures_jour
else
7.0
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment