Merge branch 'fixes/fix-some-low-priority-task' into staging

This commit is contained in:
Tiavina 2025-01-07 17:14:12 +03:00
commit 5ef1ca3b25
4 changed files with 7 additions and 7 deletions

View File

@ -13,11 +13,9 @@
</button> </button>
</div> </div>
</div> </div>
<div class="d-flex jsutify-content-end"> <div class="d-flex justify-content-end">
<button class="btn btn-secondary" id="apercusDevis">Voir les aperçus</button>
</div>
<div class="d-flex jsutify-content-end">
<button class="btn btn-secondary" id="exportDevisToFacture">Facturer</button> <button class="btn btn-secondary" id="exportDevisToFacture">Facturer</button>
<button class="btn btn-secondary" id="apercusDevis">Voir les aperçus</button>
</div> </div>
<!-- <div class="d-flex justify-content-between"> <!-- <div class="d-flex justify-content-between">
<div class="d-flex flex-column"> <div class="d-flex flex-column">

View File

@ -14,11 +14,12 @@
</div> </div>
</div> </div>
<?php if(isset($_['groups']) && in_array('admin', $_['groups'])) : ?> <?php if(isset($_['groups']) && in_array('admin', $_['groups'])) : ?>
<div class="d-flex jsutify-content-end"> <div class="d-flex justify-content-end">
<button class="btn btn-secondary" id="exportClientStat">Export client stat</button> <button class="btn btn-secondary" id="exportClientStat">Export client stat</button>
</div> </div>
<?php else: ?> <?php else: ?>
<?php endif; ?> <?php endif; ?>
<hr>
<table id="client" class="display tabledt" style="font-size:11px;"> <table id="client" class="display tabledt" style="font-size:11px;">
<thead> <thead>
<tr> <tr>

View File

@ -15,7 +15,7 @@
<thead> <thead>
<tr> <tr>
<th><?php p($l->t('ID'));?></th> <th><?php p($l->t('ID'));?></th>
<th><?php p($l->t('Reference'));?></th> <th><?php p($l->t('Nom'));?></th>
<th><?php p($l->t('Designation'));?></th> <th><?php p($l->t('Designation'));?></th>
<th><?php p($l->t('Unit price without VAT'));?></th> <th><?php p($l->t('Unit price without VAT'));?></th>
<th><?php p($l->t('Actions'));?></th> <th><?php p($l->t('Actions'));?></th>

View File

@ -13,9 +13,10 @@
</button> </button>
</div> </div>
</div> </div>
<div class="d-flex jsutify-content-end"> <div class="d-flex justify-content-end">
<button class="btn btn-secondary" id="exportThanatoData">Export thanato stat</button> <button class="btn btn-secondary" id="exportThanatoData">Export thanato stat</button>
</div> </div>
<hr>
<table id="client" class="display tabledt" style="font-size:11px;"> <table id="client" class="display tabledt" style="font-size:11px;">
<thead> <thead>
<tr> <tr>