diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index 13d086a..bd59530 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -108,19 +108,20 @@ def delete_membre(request, cd_uti):
query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;"
execute_query(request, query, {'cd_uti': cd_uti})
-def get_article(request, type, libelle):
- if type == 'TX':
- query = "SELECT * FROM articles WHERE fam='T' and libart like :libelle;"
- results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall()
- elif type == 'AR':
- query = "SELECT * FROM articles WHERE ref_cli2 like :libelle;"
- results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall()
- elif type == 'REF':
- query = "SELECT * FROM articles WHERE ref = :ref;"
- results = request.dbsession.execute(query, {'ref': libelle}).first()
+def get_article(request, type, groupe, libelle):
+ if type == 'LIB':
+ if groupe == 'TEXTE':
+ # lire tous les textes dont le libelle commençe par
+ query = "SELECT * FROM tarifs WHERE groupe='TEXTE' and libelle like :libelle;"
+ results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall()
+ else:
+ # lire tous les tarifs du grupe dont le ref commençe par libelle
+ query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref like :libelle;"
+ results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle + "%"}).fetchall()
else:
- query = "SELECT * FROM articles WHERE ref_cli2 = :ref;"
- results = request.dbsession.execute(query, {'ref': libelle}).first()
+ # lire tous les tarif du grupe dont le ref est égale à
+ query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref = :libelle;"
+ results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle}).first()
return results
def get_codespostaux(request, codep):
diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py
index 95bfcec..bcaca62 100644
--- a/mondumas/models/parametres.py
+++ b/mondumas/models/parametres.py
@@ -241,7 +241,16 @@ def update_tarif(request, ref, new_values):
query = "UPDATE tarifs SET %s WHERE ref = :ref;" % s
execute_query(request, query, new_values)
-def delete_tarifs(request, ref):
+def delete_tarif(request, ref):
query = "DELETE FROM tarifs WHERE ref = :ref ;"
execute_query(request, query, {'ref': ref})
+def get_tarifs_byGroupe(request, groupe):
+ query = "SELECT * FROM tarifs WHERE groupe = :groupe;"
+ results = request.dbsession.execute(query, {'groupe': groupe}).fetchall()
+ return results
+
+def get_tarif(request, groupe, ref):
+ query = "SELECT * FROM tarifs WHERE groupe = :groupe and ref = :ref;"
+ results = request.dbsession.execute(query, {'groupe': groupe, 'ref': ref}).first()
+ return results
diff --git a/mondumas/routes.py b/mondumas/routes.py
index 0902a5c..81fae50 100644
--- a/mondumas/routes.py
+++ b/mondumas/routes.py
@@ -68,8 +68,8 @@ def includeme(config):
config.add_route('text_edit', '/text_edit/{text_id}')
config.add_route('text_list', '/text_list')
config.add_route('text_view', '/text_view/{text_id}')
- config.add_route('tarif_edit', '/tarif_edit/{ref}')
- config.add_route('tarifs', '/tarifs')
+ config.add_route('tarif_edit', '/tarif_edit/{groupe}/{ref}')
+ config.add_route('tarifs', '/tarifs/{groupe}')
config.add_route('tarifs_import', '/tarifs_import')
config.add_route('user_edit', '/user_edit/{cd_uti}')
config.add_route('users', '/users')
diff --git a/mondumas/templates/devis/devis_ligne.pt b/mondumas/templates/devis/devis_ligne.pt
index b5e9e70..5cc18ee 100644
--- a/mondumas/templates/devis/devis_ligne.pt
+++ b/mondumas/templates/devis/devis_ligne.pt
@@ -119,6 +119,7 @@