loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' into 2.4.2

This commit is contained in:
Thomas Zilio 2018-07-05 18:16:09 +02:00
parent ff2f233d17 47d11a237b
commit 9cdf991a9a
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/init/update.php
View File

@ -80,18 +80,13 @@ if (filter('action') == 'do_update') {
echo '
<p class="text-danger">'.tr("E' fortemente consigliato rimuovere i permessi di scrittura dal file _FILE_", [
'_FILE_' => '<b>config.inc.php</b>',
]).'.</p>
]).'.</p>';
}
echo '
<a class="btn btn-success btn-block" href="'.ROOTDIR.'">
<i class="fa fa-check"></i> '.tr('Continua').'
</a>';
} else {
// Rimostro la finestra di login
echo '
<script>
$(".login-box").fadeIn();
</script>';
}
}
exit();

8
modules/anagrafiche/buttons.php
View File

@ -21,13 +21,13 @@ if (in_array($id_cliente, $tipi_anagrafica)) {
'.tr('Nuovo contratto').'
</a></li>
<li><a data-toggle="modal" data-title="'.tr('Aggiungi ddt').'" data-target="#bs-popup" data-href="add.php?id_module='.Modules::get('Ddt di vendita')['id'].'&idanagrafica='.$records[0]['idanagrafica'].'">
'.tr('Nuovo ddt').'
</a></li>
<li><a data-toggle="modal" data-title="'.tr('Aggiungi ordine').'" data-target="#bs-popup" data-href="add.php?id_module='.Modules::get('Ordini cliente')['id'].'&idanagrafica='.$records[0]['idanagrafica'].'">
'.tr('Nuovo ordine').'
</a></li>
<li><a data-toggle="modal" data-title="'.tr('Aggiungi ddt').'" data-target="#bs-popup" data-href="add.php?id_module='.Modules::get('Ddt di vendita')['id'].'&idanagrafica='.$records[0]['idanagrafica'].'">
'.tr('Nuovo ddt').'
</a></li>
<li><a data-toggle="modal" data-title="'.tr('Aggiungi fattura').'" data-target="#bs-popup" data-href="add.php?id_module='.Modules::get('Fatture di vendita')['id'].'&idanagrafica='.$records[0]['idanagrafica'].'">
'.tr('Nuova fattura').'

4
templates/fatture/body.php
View File

@ -140,7 +140,7 @@ foreach ($righe as $r) {
if ($r['sconto'] > 0) {
echo "
<br><small class='text-muted'>- ".tr('sconto _TOT_ _TYPE_', [
<br><small class='text-muted'>".tr('sconto _TOT_ _TYPE_', [
'_TOT_' => Translator::numberToLocale($r['sconto_unitario']),
'_TYPE_' => ($r['tipo_sconto'] == 'PRC' ? '%' : '&euro;'),
]).'</small>';
@ -163,7 +163,7 @@ foreach ($righe as $r) {
if ($r['sconto'] > 0) {
echo "
<br><small class='text-muted'>".tr('sconto di _TOT_ _TYPE_', [
<br><small class='text-muted'>".tr('sconto _TOT_ _TYPE_', [
'_TOT_' => Translator::numberToLocale($r['sconto']),
'_TYPE_' => '&euro;',
]).'</small>';