Skip to content

Commit a0349bd

Browse files
Pek5892Pek5892
committed
fix: corretto riferimento tabella zz_categorie
1 parent 43539b7 commit a0349bd

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎modules/articoli/ajax/search.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
'codice' => '`mg_articoli`.`codice`',
3232
'barcode' => '`mg_articoli`.`barcode`',
3333
'descrizione' => '`mg_articoli_lang`.`title`',
34-
'categoria' => '(SELECT `title` FROM `mg_categorie` LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id` = `mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `mg_categorie`.`id` = `mg_articoli`.`id_categoria`)',
35-
'subcategoria' => '(SELECT `title` FROM `mg_categorie` LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id` = `mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `mg_categorie`.`id` = `mg_articoli`.`id_sottocategoria`)',
34+
'categoria' => '(SELECT `title` FROM `zz_categorie` LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id` = `zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `zz_categorie`.`id` = `mg_articoli`.`id_categoria`)',
35+
'subcategoria' => '(SELECT `title` FROM `zz_categorie` LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id` = `zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `zz_categorie`.`id` = `mg_articoli`.`id_sottocategoria`)',
3636
'Note' => 'note',
3737
'serial' => '`mg_prodotti`.`serial`',
3838
];

‎modules/articoli/src/Export/CSV.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function getAvailableFields()
7272
'type' => 'number',
7373
],
7474
[
75-
'field' => 'mg_categorie_lang.title',
75+
'field' => 'zz_categorie_lang.title',
7676
'label' => 'Categoria',
7777
],
7878
[

‎templates/automezzi_carico/init.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
`mg_articoli`.`codice`,
3737
`mg_articoli`.`prezzo_vendita`,
3838
`co_iva`.`percentuale` AS iva,
39-
`mg_categorie_lang`.`title` AS subcategoria,
39+
`zz_categorie_lang`.`title` AS subcategoria,
4040
`mg_articoli_lang`.`title` AS descrizione,
4141
`mg_movimenti`.`qta`,
4242
`mg_movimenti`.`idutente`,
@@ -52,8 +52,8 @@
5252
LEFT JOIN `zz_groups_lang` ON (`zz_groups`.`id` = `zz_groups_lang`.`id_record` AND `zz_groups_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
5353
INNER JOIN `an_sedi` ON `mg_movimenti`.`idsede`=`an_sedi`.`id`
5454
LEFT JOIN `co_iva_lang` ON (`co_iva`.`id` = `co_iva_lang`.`id_record` AND `co_iva_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
55-
LEFT JOIN `mg_categorie` ON `mg_categorie`.`id`=`mg_articoli`.`id_sottocategoria`
56-
LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id`=`mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
55+
LEFT JOIN `zz_categorie` ON `zz_categorie`.`id`=`mg_articoli`.`id_sottocategoria`
56+
LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id`=`zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
5757
LEFT JOIN `mg_articoli_lang` ON (`mg_articoli`.`id`=`mg_articoli_lang`.`id_record` AND `mg_articoli_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
5858
WHERE
5959
`mg_movimenti`.`qta`>0 AND (`mg_movimenti`.`idsede` > 0) AND (`mg_movimenti`.`idintervento` IS NULL) AND

‎templates/automezzi_inventario/init.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@
4141
`an_sedi`.`nome`,
4242
`mg_articoli`.`codice`,
4343
`mg_articoli_lang`.`title` as descrizione,
44-
`mg_categorie_lang`.`title` AS subcategoria,
44+
`zz_categorie_lang`.`title` AS subcategoria,
4545
SUM(`mg_movimenti`.`qta`) AS qta,
4646
`mg_articoli`.`um`
4747
FROM
4848
`an_sedi`
4949
INNER JOIN `mg_movimenti` ON `mg_movimenti`.`idsede` = `an_sedi`.`id`
5050
INNER JOIN `mg_articoli` ON `mg_movimenti`.`idarticolo` = `mg_articoli`.`id`
5151
LEFT JOIN `mg_articoli_lang` ON (`mg_articoli`.`id`=`mg_articoli_lang`.`id_record` AND `mg_articoli_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
52-
LEFT JOIN `mg_categorie` ON `mg_categorie`.`id` = `mg_articoli`.`id_sottocategoria`
53-
LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id`=`mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
52+
LEFT JOIN `zz_categorie` ON `zz_categorie`.`id` = `mg_articoli`.`id_sottocategoria`
53+
LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id`=`zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).')
5454
WHERE
5555
'.implode(' AND ', $where).'
5656
GROUP BY
57-
`an_sedi`.`targa`, `an_sedi`.`nome`, `an_sedi`.`descrizione`, `mg_articoli`.`codice`, `mg_articoli_lang`.`title`, `mg_categorie_lang`.`title`, `mg_articoli`.`um`
57+
`an_sedi`.`targa`, `an_sedi`.`nome`, `an_sedi`.`descrizione`, `mg_articoli`.`codice`, `mg_articoli_lang`.`title`, `zz_categorie_lang`.`title`, `mg_articoli`.`um`
5858
ORDER BY
5959
`an_sedi`.`targa`, `an_sedi`.`descrizione`';
6060

‎templates/magazzino_cespiti/body.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
include_once __DIR__.'/../../core.php';
2424

2525
if (!empty(setting('Magazzino cespiti'))) {
26-
$query = "SELECT mg_articoli.*, movimenti.qta_totale, `mg_articoli_lang`.`title` AS 'Descrizione', `mg_categorie_lang`.`title` AS 'Categoria' FROM `mg_articoli` LEFT JOIN (SELECT idarticolo, SUM(qta) AS qta_totale FROM mg_movimenti WHERE idsede=".setting('Magazzino cespiti')." GROUP BY idarticolo) movimenti ON movimenti.idarticolo=mg_articoli.id LEFT JOIN `mg_articoli_lang` ON (`mg_articoli_lang`.`id_record` = `mg_articoli`.`id` AND `mg_articoli_lang`.`id_lang` = '1') LEFT JOIN `mg_categorie` ON `mg_articoli`.`id_categoria` = `mg_categorie`.`id` LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id` = `mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.`id_lang` = '1') WHERE 1=1 AND(`mg_articoli`.`deleted_at`) IS NULL HAVING 2=2 AND movimenti.qta_totale>0 ORDER BY `mg_articoli_lang`.`title`";
26+
$query = "SELECT mg_articoli.*, movimenti.qta_totale, `mg_articoli_lang`.`title` AS 'Descrizione', `zz_categorie_lang`.`title` AS 'Categoria' FROM `mg_articoli` LEFT JOIN (SELECT idarticolo, SUM(qta) AS qta_totale FROM mg_movimenti WHERE idsede=".setting('Magazzino cespiti')." GROUP BY idarticolo) movimenti ON movimenti.idarticolo=mg_articoli.id LEFT JOIN `mg_articoli_lang` ON (`mg_articoli_lang`.`id_record` = `mg_articoli`.`id` AND `mg_articoli_lang`.`id_lang` = '1') LEFT JOIN `zz_categorie` ON `mg_articoli`.`id_categoria` = `zz_categorie`.`id` LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id` = `zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.`id_lang` = '1') WHERE 1=1 AND(`mg_articoli`.`deleted_at`) IS NULL HAVING 2=2 AND movimenti.qta_totale>0 ORDER BY `mg_articoli_lang`.`title`";
2727

2828
if (post('tipo') == 'nozero') {
2929
$query = str_replace('2=2', '2=2 AND mg_articoli.qta > 0', $query);

0 commit comments

Comments
 (0)