From aa010117892ff8e8880e5d298065e1e717ed71c3 Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Wed, 16 Aug 2017 15:23:59 +0200 Subject: [PATCH] =?UTF-8?q?fusion=20des=20cabinets=20ind=C3=A9pendants=20d?= =?UTF-8?q?es=20soci=C3=A9t=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mondumas/models/agenda.py | 4 ++-- mondumas/static/css/style.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mondumas/models/agenda.py b/mondumas/models/agenda.py index d6be209..b234181 100644 --- a/mondumas/models/agenda.py +++ b/mondumas/models/agenda.py @@ -52,8 +52,8 @@ def get_dossier_by_no(request,nodossier): query = """ SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM %s d INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli -INNER JOIN p_cabinet a ON d.societe = a.societe and d.cabinet = a.code -INNER JOIN p_experts e ON d.societe = e.societe and d.cabinet = e.code_cab and d.expert = e.code_exp +INNER JOIN p_cabinet a ON d.cabinet = a.code +INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp where d.societe = '%s' and d.no_id=%s;""" % (table, societe, no_id); results = request.dbsession.execute(query).first() return results diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less index 21d4d71..5f41384 100644 --- a/mondumas/static/css/style.less +++ b/mondumas/static/css/style.less @@ -3,7 +3,7 @@ .navbar { margin-bottom: 0; - background-color: #f5f5f5; + background-color: #fe9900; color: #404040 !important; z-index: 9999; border: 0;