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:
c695fd3
)
Commit comment
author
Alicia FLOREZ
<alicflorez@gmail.com>
Mon, 3 Jun 2013 14:43:31 +0000
(16:43 +0200)
committer
Alicia FLOREZ
<alicflorez@gmail.com>
Mon, 3 Jun 2013 14:43:31 +0000
(16:43 +0200)
axes.py
patch
|
blob
|
history
diff --git
a/axes.py
b/axes.py
index
99f53f1
..
7d638cb
100644
(file)
--- a/
axes.py
+++ b/
axes.py
@@
-5,7
+5,7
@@
from openerp.osv import osv, fields
from datetime import date, timedelta, datetime
from openerp.osv import osv, fields
from datetime import date, timedelta, datetime
-
+# ================================ MESURABLE ================================ #
class Mesurable(osv.Model):
_name = "cmmi.axes.mesurable"
class Mesurable(osv.Model):
_name = "cmmi.axes.mesurable"
@@
-63,8
+63,7
@@
class Mesurable(osv.Model):
]
]
-#==================== TRAVAIL CALCUL JOURS OUVRES =============================
-
+#------------ TRAVAIL CALCUL JOURS OUVRES ------------
@staticmethod
def _get_date_paques(annee):
"""
@staticmethod
def _get_date_paques(annee):
"""
@@
-134,9
+133,9
@@
class Mesurable(osv.Model):
tmp += timedelta(days=1)
return jour_ouvres
tmp += timedelta(days=1)
return jour_ouvres
-#==============================================================================
+# ================================= PALIER ================================== #
class Palier(osv.Model):
_name = "cmmi.axes.palier"
class Palier(osv.Model):
_name = "cmmi.axes.palier"
@@
-188,6
+187,7
@@
class Palier(osv.Model):
+# =============================== PALIER-PHASE ============================== #
class PalierPhase(osv.Model):
_name = "cmmi.axes.palier.phase"
class PalierPhase(osv.Model):
_name = "cmmi.axes.palier.phase"
@@
-231,6
+231,8
@@
class PalierPhase(osv.Model):
return osv.Model.create(self, cr, uid, vals, context=context)
return osv.Model.create(self, cr, uid, vals, context=context)
+
+# ================================ CHANTIER ================================= #
class Chantier(osv.Model):
_name = "cmmi.axes.chantier"
class Chantier(osv.Model):
_name = "cmmi.axes.chantier"