phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ajout batch_nuit

Browse Source
This commit is contained in:
Phuoc
2020-12-13 09:19:49 +01:00
parent ef9e56a272
commit 154264fbad
6 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mondumas/templates/devis/devis_ligne.pt
View File

@@ -97,12 +97,12 @@
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<div class="form-group">
<a class="btn btn-default" href="${request.route_url('devis_web', nodevis=nodevis)}">
<span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submited">
<span class="glyphicon glyphicon-ok"></span> Enregistrer</button>
<button class="btn btn-danger" type="submit" name="form.deleted" tal:condition="nolig != '0'">
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
<a class="btn btn-default" href="${request.route_url('devis_web', nodevis=nodevis)}">
<span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>
</div>
</div>
</div>

22
mondumas/templates/devis/devis_preview.pt
View File

@@ -42,48 +42,50 @@
<!-- row : entête tableau-->
<table style="width:100%">
<tr>
<td style="width:56%"></td>
<td style="width:15%"></td>
<td style="width:41%"></td>
<td style="width:8%; text-align:right">Surf./ Qté</td>
<td style="width:18%; text-align:right">P.U. HT</td>
<td style="width:18%; text-align:right">Montant HT</td>
</tr>
<tr>
<td colspan="3"><hr></td>
<td colspan="4"><hr></td>
</tr>
<!-- clignes de détail du devis -->
<div tal:replace="structure dt_html">Les lignes du devis ici</div>
<tr>
<td colspan="3"></td>
<td colspan="4"></td>
</tr>
<tr>
<td colspan="2"></td>
<td colspan="3"></td>
<td>Total HT</td>
<td style="text-align:right">${layout.to_euro(devis.TOTALHT)}</td>
</tr>
<tr>
<td colspan="2"></td>
<td colspan="3"></td>
<td>TVA ${layout.to_percent(devis.TAUXTVA)}</td>
<td style="text-align:right">${layout.to_euro(devis.TOTALTVA)}</td>
</tr>
<tr>
<td colspan="2"></td>
<td colspan="3"></td>
<td><b>Total TTC</b></td>
<td style="text-align:right"><b>${layout.to_euro(devis.TOTALTTC)}</b></td>
</tr>
<tr>
<td colspan="3">&nbsp;</td>
<td colspan="5">&nbsp;</td>
</tr>
<tr>
<td colspan="3">
<td colspan="5">
Si vous acceptez ce devis, veuillez nous en retourner un exemplaire signé et précédé de la mention "Bon pour Accord".
</td>
</tr>
<tr>
<td colspan="3">&nbsp;</td>
<td colspan="4">&nbsp;</td>
</tr>
<!-- row : bas de devis-->
<tr>
<td>
<td colspan="2">
<p tal:condition="devis.TYPECLI == 'P'">
<b>Conditions de réglement :</b><br />
Acompte de 30 % à la commande, Le solde à réception de la facture.

6
mondumas/templates/devis/devis_web.pt
View File

@@ -71,7 +71,11 @@
</tr>
<tr tal:repeat="detail details">
<td><a href="/devis_ligne/${detail.type_ligne}/${nodevis}/${detail.nolig}">${detail.ref}</a></td>
<td>${detail.libelle}</td>
<td>
${detail.libelle}
<span tal:condition="detail.metrage"><br />${detail.metrage}</span>&nbsp;
<span tal:condition="detail.deduction">&nbsp;-&nbsp;${detail.deduction}</span>
</td>
<td class="text-right">${layout.to_decz(detail.qte)}</td>
<td class="text-right">${layout.to_euroz(detail.prixht)}</td>
<td class="text-right">${layout.to_euroz(detail.mtht)}</td>