diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index f910570..4bd8fe9 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -278,11 +278,11 @@ def insert_facture_rdf(request, societe, nochantier, cd_cli, nomcli, user, ref, query = "CALL spINS_FACTURE_RDF(:societe, :nochantier, :cd_cli, :nomcli, :user, :ref, :date_rapport)" execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'cd_cli': cd_cli, 'nomcli': nomcli, 'user': user, 'ref': ref, 'date_rapport': date_rapport}) -def insert_dossier(request, societe, cd_cli, c_nom, c_adr, c_adr2, c_cp, c_ville, c_telp, c_email, nosin, c_obs, tx_trav): +def insert_dossier(request, societe, cd_cli, c_nom, c_adr, c_adr2, c_cp, c_ville, c_telp, c_email, nosin, nopol, c_obs, tx_trav): # créer une dem_devis selon l'email de l'OS - query = """CALL spINS_DEMANDES(:societe, :cd_cli, :c_nom, :c_adr, :c_adr2, :c_cp, :c_ville, :c_telp, :c_email, 'MR', 6, :nosin, :c_obs, :tx_trav, 'EMAIL');""" + query = """CALL spINS_DEMANDES(:societe, :cd_cli, :c_nom, :c_adr, :c_adr2, :c_cp, :c_ville, :c_telp, :c_email, 'MR', 6, :nosin, :nopol, :c_obs, :tx_trav, 'EMAIL');""" execute_query(request, query, {'societe': societe, 'cd_cli': cd_cli, 'c_nom': c_nom, 'c_adr': c_adr, 'c_adr2': c_adr2, 'c_cp': c_cp, - 'c_ville': c_ville,'c_telp': c_telp, 'nosin': nosin, 'c_obs': c_obs, 'tx_trav': tx_trav, 'c_email': c_email}) + 'c_ville': c_ville,'c_telp': c_telp, 'nosin': nosin, 'nopol': nopol, 'c_obs': c_obs, 'tx_trav': tx_trav, 'c_email': c_email}) query = "SELECT no_id FROM dem_devis WHERE societe = :societe AND date = curdate() AND cd_cli = :cd_cli ORDER BY no_id desc LIMIT 1;" results = request.dbsession.execute(query, {'societe': societe, 'cd_cli': cd_cli}).first() diff --git a/mondumas/routes.py b/mondumas/routes.py index 33ff06e..5959311 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -44,6 +44,7 @@ def includeme(config): config.add_route('suivi_edit','/suivi_edit/{nodossier}/{nolig}') config.add_route('upload_doc', '/upload_doc/{nodossier}/{origine}') config.add_route('upload_img', '/upload_img/{norapport}/{nosection}') + config.add_route('upload_om', '/upload_om') # parametres config.add_route('parametres', '/parametres') config.add_route('article_edit', '/article_edit/{ref}') diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt index 62eac17..f4335c1 100644 --- a/mondumas/templates/default/home.pt +++ b/mondumas/templates/default/home.pt @@ -39,6 +39,11 @@

EMAILS DOSSIERS

+
+ + +

PDF DOSSIERS

+
diff --git a/mondumas/templates/dossier/upload_doc.pt b/mondumas/templates/dossier/upload_doc.pt index 9f64427..bbabc37 100644 --- a/mondumas/templates/dossier/upload_doc.pt +++ b/mondumas/templates/dossier/upload_doc.pt @@ -1,7 +1,6 @@
-

La taille de chaque document ne doit pas dépasser 4 Mo. -
- +

Documents déjà téléchargés dans le dossier