diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index d43ca9de0..1e58a67e9 100644 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -398,6 +398,28 @@ if (!empty($note_accredito)) { '; } +?> + +fetchArray('SELECT DATE_FORMAT(created_at,"%d/%m/%Y") AS data , DATE_FORMAT(created_at,"%H:%i") AS ora, (SELECT name FROM zz_emails WHERE id = id_email) AS tipo_email, (SELECT username FROM zz_users WHERE id = id_utente) AS user FROM zz_operations WHERE id_record = '.prepare($id_record).' AND op = "send-email" ORDER BY created_at DESC'); + + //Se la mail è stata inviata, mostro la data + if( count($rs_operations)>0 ){ + foreach ($rs_operations as $operation){ + echo " + ".tr('_TIPO_ inviata il _DATA_ alle _ORA_ da _USER_.', [ + '_TIPO_' => $operation['tipo_email'], + '_DATA_' => $operation['data'], + '_ORA_' => $operation['ora'], + '_USER_' => $operation['user'], + ]).'
'; + + } + }else{ + echo "".tr("nessuna email inviata al cliente.")."\n"; + } + ?> diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php index f10dcad94..ac850813a 100644 --- a/modules/fatture/row-list.php +++ b/modules/fatture/row-list.php @@ -16,9 +16,9 @@ echo ' '.tr('Descrizione').' '.tr('Q.tà').' '.tr('U.m.').' - '.tr('Costo unitario').' + '.tr('Prezzo unitario').' '.tr('Iva').' - '.tr('Imponibile').' + '.tr('Importo').' @@ -143,7 +143,7 @@ if (!empty($rs)) { echo ' '; - // Costo unitario + // Prezzo unitario echo ' '; @@ -170,14 +170,13 @@ if (!empty($rs)) { if (empty($r['is_descrizione'])) { echo ' '.Translator::numberToLocale($r['iva']).' € -
'.$r['desc_iva'].' - '.$r['iva'].''; +
'.$r['desc_iva'].''; } echo ' '; - // Imponibile + // Importo echo ' '; if (empty($r['is_descrizione'])) { diff --git a/templates/fatture/body.php b/templates/fatture/body.php index 1a375957c..7e6dae52d 100644 --- a/templates/fatture/body.php +++ b/templates/fatture/body.php @@ -162,11 +162,11 @@ foreach ($righe as $r) { '.(empty($r['subtotale']) ? '' : Translator::numberToLocale($r['subtotale'] - $r['sconto'])).' €'; if ($r['sconto'] > 0) { - echo " + /*echo "
".tr('sconto _TOT_ _TYPE_', [ '_TOT_' => Translator::numberToLocale($r['sconto']), '_TYPE_' => '€', - ]).''; + ]).'';*/ if ($count <= 1) { $count += 0.4;