diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less
index 4e0c942..d5acee2 100644
--- a/mondumas/static/css/style.less
+++ b/mondumas/static/css/style.less
@@ -105,3 +105,23 @@
.logo-small {
font-size: 50px;
}
+.bg-PE {
+ background-color: #ffffb3 !important;
+ color: black;
+}
+.bg-ME {
+ background-color: #ffe44d !important;
+ color: black;
+}
+.bg-PL {
+ background-color: #b3ff66 !important;
+ color: black;
+}
+.bg-PO {
+ background-color: #b1dae7 !important;
+ color: black;
+}
+.bg-CD {
+ background-color: #ffb3cc !important;
+ color: black;
+}
diff --git a/mondumas/static/img/link2DEVFAC14.bat b/mondumas/static/img/link2DEVFAC14.bat
deleted file mode 100644
index 35bba9a..0000000
--- a/mondumas/static/img/link2DEVFAC14.bat
+++ /dev/null
@@ -1 +0,0 @@
-mklink /J DEVFAC14 C:\DEVFAC14
diff --git a/mondumas/static/img/link2DEVFAC14.txt b/mondumas/static/img/link2DEVFAC14.txt
new file mode 100644
index 0000000..150f17b
--- /dev/null
+++ b/mondumas/static/img/link2DEVFAC14.txt
@@ -0,0 +1,5 @@
+-- Windows 10, lecteur local
+mklink /J DEVFAC14 C:\DEVFAC14
+
+-- Windows server, lecteur réseau
+mklink /D DEVFAC14 \\SRVTSE\DEVFAC14
diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt
index 19aef5d..9ac7f0c 100644
--- a/mondumas/templates/agenda/agenda.pt
+++ b/mondumas/templates/agenda/agenda.pt
@@ -33,10 +33,11 @@
- RDV Peinture
- RDV Menuiserie
- RDV Plomberie
- RDV Plomberie
+ RDV Peinture
+ RDV Menuiserie
+ RDV Plomberie
+ RDV Polynet
+ RDV Couleurs & Déco
diff --git a/mondumas/templates/agenda/planning.pt b/mondumas/templates/agenda/planning.pt
index ac06b0b..6c706af 100644
--- a/mondumas/templates/agenda/planning.pt
+++ b/mondumas/templates/agenda/planning.pt
@@ -8,10 +8,11 @@
- RDV Peinture
- RDV Menuiserie
- RDV Plomberie
- RDV Plomberie
+ RDV Peinture
+ RDV Menuiserie
+ RDV Plomberie
+ RDV Polynet
+ RDV Couleurs & Déco
diff --git a/mondumas/templates/dossier/devis_view.pt b/mondumas/templates/dossier/devis_view.pt
index 95b7ba6..2fc6f14 100644
--- a/mondumas/templates/dossier/devis_view.pt
+++ b/mondumas/templates/dossier/devis_view.pt
@@ -55,7 +55,7 @@
-
+
CLIENT |
@@ -82,8 +82,23 @@
Statut : ${dossier.STATUS}
-
+
+
+ | Total HT |
+ Total TVA |
+ Total TTC |
+ TVA |
+
+
+ | ${layout.to_decz(dossier.TOTALHT)} |
+ ${layout.to_euroz(dossier.TOTALTVA)} |
+ ${layout.to_euroz(dossier.TOTALTTC)} |
+ ${dossier.TAUXTVA} % |
+
+
+
+
| Réf |
Désignation |
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index f063aba..afeacb6 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -55,7 +55,7 @@
-
+
CLIENT |
diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py
index 6370728..634c4e0 100644
--- a/mondumas/views/agenda.py
+++ b/mondumas/views/agenda.py
@@ -129,13 +129,15 @@ def agenda(request):
# déterminer la couleur de l'event selon la societe
societe = row.nodossier[0:2]
if societe == "PE":
- color = "LightYellow"
+ color = "#ffffb3"
+ elif societe == "ME":
+ color = "#ffe44d"
elif societe == "PL":
- color = "LightGreen"
+ color = "#b3ff66"
elif societe == "PO":
- color = "LightBlue"
+ color = "#b1dae7"
else:
- color = "Gold"
+ color = "#ffb3cc"
json_event = {
'title': '%s %s' % (row.c_qualite, row.c_nom),
@@ -188,13 +190,15 @@ def planning(request):
# déterminer la couleur de l'event selon la societe
societe = row.nodossier[0:2]
if societe == "PE":
- color = "LightYellow"
+ color = "#ffffb3"
+ elif societe == "ME":
+ color = "#ffe44d"
elif societe == "PL":
- color = "LightGreen"
+ color = "#b3ff66"
elif societe == "PO":
- color = "LightBlue"
+ color = "#b1dae7"
else:
- color = "Gold"
+ color = "#ffb3cc"
json_event = {
'resourceId': user.CD_UTI,
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 4059310..c14aa4d 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -99,7 +99,9 @@ def dossier_view(request):
similaires = get_similaires_byChantier(request, dossier.societe, dossier.C_NOM, dossier.C_ADR, dossier.C_CP, dossier.C_VILLE)
# lire tous les documents attachés
docs_attaches = get_docs_attaches(request, 'DOCS_ATTACHES', nodossier)
-
+ # select background color according to society
+ bg_color = "bg-%s" % societe
+
return {
'page_title': u"Dossier : %s" % (nodossier),
'nodossier': nodossier,
@@ -109,11 +111,13 @@ def dossier_view(request):
'similaires': similaires,
'docs_attaches': docs_attaches,
'docs_url': request.static_url(request.registry.settings['mondumas.DEVFAC14']),
+ 'bg_color': bg_color,
}
@view_config(route_name='devis_view', renderer='../templates/dossier/devis_view.pt', permission='view')
def devis_view(request):
nodossier = request.matchdict['nodossier']
+ societe = nodossier[0:2]
url = request.route_url("devis_view", nodossier=nodossier)
type_doc = nodossier[3:5]
@@ -130,12 +134,15 @@ def devis_view(request):
return HTTPFound(location=request.route_url("dossier_lookup"))
# lire tous les lignes du devis
details = get_devis_lig_by_no(request, nodossier)
+ # select background color according to society
+ bg_color = "bg-%s" % societe
return {
'page_title': page_title,
'nodossier': nodossier,
'dossier': dossier,
'details': details,
+ 'bg_color': bg_color,
}
@view_config(route_name='dossier_selected', permission='view')