|
42 | 42 | $query = "SELECT |
43 | 43 | DISTINCT `mg_articoli`.`id`, |
44 | 44 | IF(`categoria_lang`.`title` IS NOT NULL, CONCAT(`categoria_lang`.`title`, IF(`sottocategoria_lang`.`title` IS NOT NULL, CONCAT(' (', `sottocategoria_lang`.`title`, ')'), '-')), '<i>".tr('Nessuna categoria')."</i>') AS optgroup, |
45 | | - `mg_articoli`.`barcode`, |
| 45 | + `mg_articoli_barcode`.`barcode` AS barcode, |
46 | 46 | `mg_articoli`.".($prezzi_ivati ? '`prezzo_vendita_ivato`' : '`prezzo_vendita`').' AS prezzo_vendita, |
47 | 47 | `mg_articoli`.`prezzo_vendita_ivato` AS prezzo_vendita_ivato, |
48 | 48 | `mg_articoli`.'.($prezzi_ivati ? '`minimo_vendita_ivato`' : '`minimo_vendita`').' AS minimo_vendita,'; |
|
114 | 114 | LEFT JOIN `co_iva` AS iva_articolo ON `iva_articolo`.`id` = `mg_articoli`.`idiva_vendita` |
115 | 115 | LEFT JOIN `co_iva_lang` AS iva_articolo_lang on (`iva_articolo`.`id` = `iva_articolo_lang`.`id_record` AND `iva_articolo_lang`.`id_lang` = ".prepare(Models\Locale::getDefault()->id).") |
116 | 116 | LEFT JOIN `co_iva` AS `iva_predefinita` ON `iva_predefinita`.`id` = '.$iva_predefinita.' |
117 | | - LEFT JOIN `co_iva_lang` AS iva_predefinita_lang on (`iva_predefinita`.`id` = `iva_predefinita_lang`.`id_record` AND `iva_predefinita_lang`.`id_lang` = ".prepare(Models\Locale::getDefault()->id).')'; |
| 117 | + LEFT JOIN `co_iva_lang` AS iva_predefinita_lang on (`iva_predefinita`.`id` = `iva_predefinita_lang`.`id_record` AND `iva_predefinita_lang`.`id_lang` = ".prepare(Models\Locale::getDefault()->id).') |
| 118 | + LEFT JOIN mg_articoli_barcode ON mg_articoli_barcode.idarticolo = mg_articoli.id'; |
118 | 119 |
|
119 | 120 | if ($usare_iva_anagrafica) { |
120 | 121 | $query .= ' |
|
179 | 180 | if (!empty($search)) { |
180 | 181 | $search_fields[] = '`mg_articoli_lang`.`title` LIKE '.prepare('%'.$search.'%'); |
181 | 182 | $search_fields[] = '`mg_articoli`.`codice` LIKE '.prepare('%'.$search.'%'); |
182 | | - $search_fields[] = '`mg_articoli`.`barcode` LIKE '.prepare('%'.$search.'%'); |
183 | 183 | $search_fields[] = '`categoria_lang`.`title` LIKE '.prepare('%'.$search.'%'); |
| 184 | + $search_fields[] = '`mg_articoli_barcode`.`barcode` LIKE '.prepare('%'.$search.'%'); |
184 | 185 | $search_fields[] = '`sottocategoria_lang`.`title` LIKE '.prepare('%'.$search.'%'); |
185 | 186 |
|
186 | 187 | if ($usare_dettaglio_fornitore) { |
|
292 | 293 | `mg_fornitore_articolo`.`id` AS id_dettaglio_fornitore |
293 | 294 | FROM `mg_articoli` |
294 | 295 | LEFT JOIN `mg_fornitore_articolo` ON `mg_fornitore_articolo`.`id_articolo` = `mg_articoli`.`id` AND `mg_fornitore_articolo`.`deleted_at` IS NULL AND `mg_fornitore_articolo`.`id_fornitore` = '.prepare($id_anagrafica).' |
| 296 | + LEFT JOIN `mg_articoli_barcode` ON `mg_articoli`.`id` = `mg_articoli_barcode`.`idarticolo` |
295 | 297 | |where|'; |
296 | 298 |
|
297 | 299 | $where[] = '`mg_articoli`.`attivo` = 1'; |
298 | 300 | $where[] = '`mg_articoli`.`deleted_at` IS NULL'; |
299 | 301 |
|
300 | 302 | if (!empty($search)) { |
301 | 303 | $search_fields[] = '`mg_articoli`.`codice` LIKE '.prepare('%'.$search.'%'); |
302 | | - $search_fields[] = '`mg_articoli`.`barcode` LIKE '.prepare('%'.$search.'%'); |
| 304 | + $search_fields[] = '`mg_articoli_barcode`.`barcode` LIKE '.prepare('%'.$search.'%'); |
303 | 305 | } |
304 | 306 |
|
305 | 307 | break; |
|
0 commit comments