diff --git a/modules/contratti/row-list.php b/modules/contratti/row-list.php index 329c0a46b..f2edecb5a 100755 --- a/modules/contratti/row-list.php +++ b/modules/contratti/row-list.php @@ -81,6 +81,12 @@ foreach ($righe as $riga) { echo ' '.$descrizione; + + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/modules/ddt/row-list.php b/modules/ddt/row-list.php index cb3cd4635..9cb513de0 100755 --- a/modules/ddt/row-list.php +++ b/modules/ddt/row-list.php @@ -119,6 +119,12 @@ foreach ($righe as $riga) { } } + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php index ab6eaadea..e1d0c697b 100755 --- a/modules/fatture/row-list.php +++ b/modules/fatture/row-list.php @@ -163,6 +163,11 @@ foreach ($righe as $riga) { } } + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/modules/interventi/row-list.php b/modules/interventi/row-list.php index 9c13edf9b..fdb15c73c 100755 --- a/modules/interventi/row-list.php +++ b/modules/interventi/row-list.php @@ -107,6 +107,11 @@ echo ' } } + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/modules/ordini/row-list.php b/modules/ordini/row-list.php index 8b6da5f43..2a8d027b4 100755 --- a/modules/ordini/row-list.php +++ b/modules/ordini/row-list.php @@ -135,6 +135,11 @@ foreach ($righe as $riga) { } } + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/modules/preventivi/row-list.php b/modules/preventivi/row-list.php index 05ffd952f..1fda41cf1 100755 --- a/modules/preventivi/row-list.php +++ b/modules/preventivi/row-list.php @@ -82,6 +82,14 @@ foreach ($righe as $riga) { } echo ' '.$descrizione; + + + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + + if (!empty($riga->note)) { echo '
'.nl2br($riga->note).''; diff --git a/plugins/pianificazione_interventi/row-list.php b/plugins/pianificazione_interventi/row-list.php index 6ed41a16d..8ed5e072b 100755 --- a/plugins/pianificazione_interventi/row-list.php +++ b/plugins/pianificazione_interventi/row-list.php @@ -80,6 +80,12 @@ if (!$righe->isEmpty()) {
'.tr('SN').': '.implode(', ', $serials); } } + + if ($riga->isArticolo() && !empty($riga->articolo->barcode)) { + echo ' +
'.$riga->articolo->barcode.''; + } + echo ' '; diff --git a/update/2_4_38.sql b/update/2_4_38.sql index 2e36fc09a..d522efdbd 100644 --- a/update/2_4_38.sql +++ b/update/2_4_38.sql @@ -609,4 +609,7 @@ WHERE HAVING 2=2 ORDER BY - an_anagrafiche.ragione_sociale" WHERE `name` = 'Listini'; \ No newline at end of file + an_anagrafiche.ragione_sociale" WHERE `name` = 'Listini'; + +-- Aggiunta campi provvigione su righe promemoria +ALTER TABLE `co_righe_promemoria` ADD `provvigione` DECIMAL(15,6) NOT NULL AFTER `prezzo_unitario_ivato`, ADD `provvigione_unitaria` DECIMAL(15,6) NOT NULL AFTER `provvigione`, ADD `provvigione_percentuale` DECIMAL(15,6) NOT NULL AFTER `provvigione_unitaria`, ADD `tipo_provvigione` ENUM('UNT','PRC') NOT NULL DEFAULT 'UNT' AFTER `provvigione_percentuale`; \ No newline at end of file