Extend search in invoice report to cover all text attributes

config/Reports/invoices.xml

@@ -93,7 +93,7 @@
                 var searchclause = "";
                 if(search.text.length > 0)
                 {
-                    searchclause = " AND id IN (SELECT invoice_id FROM invoice_items WHERE item_id IN (SELECT item FROM certifications WHERE certification ~* :p1 UNION SELECT id FROM coffees WHERE origin ~* :p2 UNION SELECT id FROM items WHERE name ~* :p3 UNION SELECT id FROM coffees WHERE reference ~* :p4))";
+                    searchclause = " AND id IN (SELECT invoice_id FROM invoice_items WHERE item_id IN (SELECT item FROM certifications WHERE certification ~* :p1 UNION SELECT id FROM coffees WHERE origin ~* :p2 UNION SELECT id FROM items WHERE name ~* :p3 UNION SELECT id FROM coffees WHERE reference ~* :p4 UNION SELECT id FROM coffees WHERE region ~* :p5 UNION SELECT id FROM coffees WHERE producer ~* :p6 UNION SELECT id FROM coffees WHERE grade ~* :p7 UNION SELECT id FROM coffees WHERE milling ~* :p8 UNION SELECT id FROM coffees WHERE drying ~* :p9 UNION SELECT id FROM decaf_coffees WHERE decaf_method ~* :p10) OR description ~* :p11 UNION SELECT id FROM invoices WHERE invoice ~* :p12 UNION SELECT id FROM invoices WHERE vendor ~* :p13)";
                 }
                 query.prepare("SELECT id, time::date, vendor, invoice, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id)::numeric(12,2) AS cost FROM invoices WHERE time >= :sd AND time < :ed::date + interval '1 day'" + vendorclause + searchclause + " ORDER BY time DESC");
                 query.bind(":sd", startDate);
@@ -108,6 +108,15 @@
                     query.bind(":p2", pattern);
                     query.bind(":p3", pattern);
                     query.bind(":p4", pattern);
+                    query.bind(":p5", pattern);
+                    query.bind(":p6", pattern);
+                    query.bind(":p7", pattern);
+                    query.bind(":p8", pattern);
+                    query.bind(":p9", pattern);
+                    query.bind(":p10", pattern);
+                    query.bind(":p11", pattern);
+                    query.bind(":p12", pattern);
+                    query.bind(":p13", pattern);
                 }
                 query.exec();
                 var cost_sum = 0;