fusion devis et facture dans un chantier
This commit is contained in:
@@ -133,11 +133,11 @@
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
<a href="${request.application_url}/devis_list" tal:condition="logged_in == 'CAO'">
|
||||
<a href="${request.application_url}/devis_list/PE/0" tal:condition="logged_in == 'CAO'">
|
||||
<div class="info-box bg-prod">
|
||||
<span class="info-box-icon"><i class="glyphicon glyphicon-text-height"></i></span>
|
||||
<span class="info-box-icon"><i class="glyphicon glyphicon-search"></i></span>
|
||||
<div class="info-box-content">
|
||||
<span class="info-box-number">E-DEVIS</span>
|
||||
<span class="info-box-number">RECHERCHE DEVIS</span>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
@@ -27,10 +27,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">Nom ou numéro du chantier</label>
|
||||
<label class="col-sm-4 control-label">Numéro du devis</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="text" class="form-control" name="name" value="${name}"
|
||||
placeholder="Le nom ou le numéro doit avoir de 2 à 30 caractères de long" >
|
||||
<input type="text" class="form-control" name="nodevis" value="${nodevis}" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -53,19 +52,20 @@
|
||||
<th>Client</th>
|
||||
<th>Chantier</th>
|
||||
<th class="text-right">Montant</th>
|
||||
<th>Sinistre</th>
|
||||
<th class="text-center">Statut</th>
|
||||
<th>No chantier</th>
|
||||
<th class="text-center">Action</th>
|
||||
</tr>
|
||||
<tr tal:repeat="detail devis">
|
||||
<td>
|
||||
<a href="/devis_web/${societe}-DE${detail.numero}">${societe}-${detail.numero}-W</a>
|
||||
</td>
|
||||
<tr tal:repeat="detail dossiers">
|
||||
<td>${detail.TYPE}-${detail.numero}</td>
|
||||
<td>${detail.date.strftime('%d-%m-%Y')}</td>
|
||||
<td>${detail.nomcli}</td>
|
||||
<td>${detail.chantier}</td>
|
||||
<td class="text-right">${layout.to_euro(detail.montant)}</td>
|
||||
<td>${detail.nosin}</td>
|
||||
<td class="text-center">${detail.status}</td>
|
||||
<td>${detail.nochantier}</td>
|
||||
<td class="text-center">
|
||||
<a tal:condition="detail.nochantier == 0" id="modalButton" href="#confirmCreate"
|
||||
data-toggle="modal" data-societe="${detail.societe}" data-nodevis="${detail.TYPE}-${detail.numero}">Joindre</a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
@@ -74,26 +74,53 @@
|
||||
<br />
|
||||
</div>
|
||||
|
||||
<!-- Modal : Confirmation CREATION -->
|
||||
<div class="modal fade" id="confirmCreate" role="dialog" aria-labelledby="confirmCreateLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title">Ajouter le nochantier dans le </h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<!-- The form is placed inside the body of modal -->
|
||||
<form id="add_justif-form" class="form-horizontal" action="${url}" method="post">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-4">Document No:</label>
|
||||
<div class="col-xs-8">
|
||||
<input type="text" name="md_nodevis" id="md_nodevis" value="" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-4">Chantier No :</label>
|
||||
<div class="col-xs-8">
|
||||
<input type="text" name="md_nochantier" id="md_nochantier" value=""/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-4">Société:</label>
|
||||
<div class="col-xs-8">
|
||||
<input type="text" name="md_societe" id="md_societe" value="" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
|
||||
<button type="submit" class="btn btn-success" name="form.joined">Ajouter</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#devis-search-form').formValidation({
|
||||
framework: 'bootstrap',
|
||||
message: 'This value is not valid',
|
||||
icon: {
|
||||
valid: 'glyphicon glyphicon-ok',
|
||||
invalid: 'glyphicon glyphicon-remove',
|
||||
validating: 'glyphicon glyphicon-refresh'
|
||||
},
|
||||
});
|
||||
$('form input').on('keypress', function(e) {
|
||||
var code = e.keyCode || e.which;
|
||||
if (code === 13) {
|
||||
e.preventDefault();
|
||||
// simuler clic bouton submit
|
||||
document.getElementById("submitButton").click();
|
||||
}
|
||||
});
|
||||
|
||||
$('#confirmCreate').on('show.bs.modal', function(e) {
|
||||
var societe = $(e.relatedTarget).data('societe');
|
||||
var nodevis = $(e.relatedTarget).data('nodevis');
|
||||
$(e.currentTarget).find('input[name="md_societe"]').val(societe);
|
||||
$(e.currentTarget).find('input[name="md_nodevis"]').val(nodevis);
|
||||
});
|
||||
</script>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user