projects
/
OpenERP
/
cmmi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a654e53
)
Ajout du nombre de jours réels pour un mesurable
author
Alicia FLOREZ
<alicflorez@gmail.com>
Thu, 13 Jun 2013 13:22:03 +0000
(15:22 +0200)
committer
Alicia FLOREZ
<alicflorez@gmail.com>
Thu, 13 Jun 2013 13:22:03 +0000
(15:22 +0200)
axes.py
patch
|
blob
|
history
diff --git
a/axes.py
b/axes.py
index
0dbbe80
..
99e74a1
100644
(file)
--- a/
axes.py
+++ b/
axes.py
@@
-40,6
+40,17
@@
class Mesurable(osv.Model):
return result
return result
+ def _nb_jours_reel(self, cr, uid, ids, field, arg, context=None):
+ result = {}
+ for m in self.browse(cr, uid, ids, context=context):
+ if not m.date_reel_deb or not m.date_reel_fin:
+ result[m.id] = 0
+ continue
+ result[m.id] = Mesurable._nb_jours_ouvre_entre_2_dates(
+ datetime.strptime(m.date_reel_deb, "%Y-%m-%d").date(),
+ datetime.strptime(m.date_reel_fin, "%Y-%m-%d").date())
+ return result
+
_columns = {
"name": fields.char(string="Title", size=64, required=True),
"description": fields.text(string="Description"),
_columns = {
"name": fields.char(string="Title", size=64, required=True),
"description": fields.text(string="Description"),
@@
-59,6
+70,9
@@
class Mesurable(osv.Model):
"nb_jours_plan": fields.function(_nb_jours_plan,
type="integer",
string="Nombre de jours planifiés"),
"nb_jours_plan": fields.function(_nb_jours_plan,
type="integer",
string="Nombre de jours planifiés"),
+ "nb_jours_reel": fields.function(_nb_jours_reel,
+ type="integer",
+ string="Nombre de jours réels"),
}
_defaults = {
}
_defaults = {