1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-17 03:51:06 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
valentina
91ff5370e1 fix: colore di sfondo options selezionati 2024-10-28 09:50:47 +01:00
Beppe
11e4eb28de Fix: Correzione visualizzazione doppia dei preventivi in dashboard 2024-10-28 09:35:07 +01:00
2 changed files with 5 additions and 5 deletions

View File

@ -134,10 +134,10 @@ switch (filter('op')) {
`co_statipreventivi_lang`.`title` as stato,
`co_statipreventivi`.`is_completato`,
`an_anagrafiche`. `ragione_sociale` AS cliente,
`zz_files`.`id` AS have_attachments
IF(`have_attachments`.`cont`, 1, 0) AS have_attachments
FROM `co_preventivi`
INNER JOIN `an_anagrafiche` ON `co_preventivi`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`
LEFT JOIN `zz_files` ON `zz_files`.`id_record` = `co_preventivi`.`id` AND `zz_files`.`id_module` = '.prepare($modulo_preventivi->id).'
LEFT JOIN (SELECT COUNT(id) as cont, id_record FROM `zz_files` WHERE `zz_files`.`id_module` = '.prepare($modulo_preventivi->id).') as `have_attachments` ON `have_attachments`.`id_record` = `co_preventivi`.`id`
LEFT JOIN `co_statipreventivi` ON `co_preventivi`.`idstato` = `co_statipreventivi`.`id`
LEFT JOIN `co_statipreventivi_lang` ON (`co_statipreventivi_lang`.`id_record` = `co_statipreventivi`.`id` AND `co_statipreventivi_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
WHERE
@ -374,11 +374,11 @@ switch (filter('op')) {
`co_preventivi`.`data_accettazione`,
`co_preventivi`.`data_conclusione`,
`an_anagrafiche`.`ragione_sociale` AS cliente,
`zz_files`.`id` AS have_attachments
IF(`have_attachments`.`cont`, 1, 0) AS have_attachments
FROM
`co_preventivi`
INNER JOIN `an_anagrafiche` ON `co_preventivi`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`
LEFT JOIN zz_files ON zz_files.id_record = co_preventivi.id AND zz_files.id_module = '.prepare($modulo_preventivi->id).'
LEFT JOIN (SELECT COUNT(id) as cont, id_record FROM `zz_files` WHERE `zz_files`.`id_module` = '.prepare($modulo_preventivi->id).') as `have_attachments` ON `have_attachments`.`id_record` = `co_preventivi`.`id`
LEFT JOIN `co_statipreventivi` ON `co_preventivi`.`idstato` = `co_statipreventivi`.`id`
LEFT JOIN `co_statipreventivi_lang` ON (`co_statipreventivi_lang`.`id_record` = `co_statipreventivi`.`id` AND `co_statipreventivi_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
WHERE

View File

@ -168,7 +168,7 @@ class SelectHandler implements HandlerInterface
}
if (!empty($element['_bgcolor_'])) {
$attributes[] = 'style="background:'.$element['_bgcolor_'].'; color:'.color_inverse($element['_bgcolor_'].';"');
$attributes[] = 'style="background:'.$element['_bgcolor_'].'; color:'.color_inverse($element['_bgcolor_']).'"';
}
// Leggo ulteriori campi oltre a id e descrizione per inserirli nell'option nella forma "data-nomecampo1", "data-nomecampo2", ecc