From b25db97c2815dc574e5faf2e960d90e899184e0b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 30 Aug 2014 05:30:37 +0200 Subject: [PATCH 1/3] Typo --- htdocs/core/lib/admin.lib.php | 2 +- htdocs/core/lib/agenda.lib.php | 4 ++-- htdocs/core/lib/bank.lib.php | 2 +- htdocs/core/lib/categories.lib.php | 2 +- htdocs/core/lib/contact.lib.php | 2 +- htdocs/core/lib/contract.lib.php | 2 +- htdocs/core/lib/ecm.lib.php | 8 ++++---- htdocs/core/lib/emailing.lib.php | 2 +- htdocs/core/lib/fichinter.lib.php | 2 +- htdocs/core/lib/fiscalyear.lib.php | 2 +- htdocs/core/lib/fourn.lib.php | 4 ++-- htdocs/core/lib/order.lib.php | 2 +- htdocs/core/lib/prelevement.lib.php | 2 +- htdocs/core/lib/product.lib.php | 2 +- htdocs/core/lib/project.lib.php | 6 +++--- htdocs/core/lib/propal.lib.php | 2 +- htdocs/core/lib/sendings.lib.php | 4 ++-- htdocs/core/lib/stock.lib.php | 2 +- htdocs/core/lib/tax.lib.php | 2 +- htdocs/core/lib/trip.lib.php | 2 +- htdocs/core/lib/usergroups.lib.php | 4 ++-- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index b6f2b02567a..14963b72288 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -508,7 +508,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not /** * Prepare array with list of tabs * - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function security_prepare_head() { diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index a0c1e3f1b4b..007f8474721 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -360,7 +360,7 @@ function show_array_last_actions_done($max=5) /** * Prepare array with list of tabs * - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function agenda_prepare_head() { @@ -405,7 +405,7 @@ function agenda_prepare_head() * Prepare array with list of tabs * * @param object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function actions_prepare_head($object) { diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index c17c78bc8e1..349cb15063f 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -28,7 +28,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function bank_prepare_head($object) { diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php index fb3a0210ef6..4d020526e44 100644 --- a/htdocs/core/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -27,7 +27,7 @@ * * @param Object $object Object related to tabs * @param string $type Type of category - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function categories_prepare_head($object,$type) { diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index b729aae2589..2518f7b7883 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -26,7 +26,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function contact_prepare_head($object) { diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php index 1086d4dcd14..e51f7594ac9 100644 --- a/htdocs/core/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -26,7 +26,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function contract_prepare_head($object) { diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php index 1257d6a9bd1..2f12976e49f 100644 --- a/htdocs/core/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -27,7 +27,7 @@ * Prepare array with list of different ecm main dashboard * * @param object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function ecm_prepare_dasboard_head($object) { @@ -64,7 +64,7 @@ function ecm_prepare_dasboard_head($object) * Prepare array with list of tabs * * @param object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function ecm_prepare_head($object) { @@ -84,7 +84,7 @@ function ecm_prepare_head($object) * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function ecm_file_prepare_head($object) { @@ -104,7 +104,7 @@ function ecm_file_prepare_head($object) * Prepare array with list of tabs * * @param object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function ecm_prepare_head_fm($object) { diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php index 6c06a1eccb2..613b12dadad 100644 --- a/htdocs/core/lib/emailing.lib.php +++ b/htdocs/core/lib/emailing.lib.php @@ -25,7 +25,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function emailing_prepare_head($object) { diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php index 01d79cdcabe..342a35a3d70 100644 --- a/htdocs/core/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -28,7 +28,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function fichinter_prepare_head($object) { diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php index 60b2c810294..1db099b24bf 100644 --- a/htdocs/core/lib/fiscalyear.lib.php +++ b/htdocs/core/lib/fiscalyear.lib.php @@ -25,7 +25,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function fiscalyear_prepare_head($object) { diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index 171eda67a90..58d553e36d5 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -29,7 +29,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function facturefourn_prepare_head($object) { @@ -92,7 +92,7 @@ function facturefourn_prepare_head($object) * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function ordersupplier_prepare_head($object) { diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 948bd74281c..43427acd59a 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -29,7 +29,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function commande_prepare_head($object) { diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php index c6305423a96..dde5981cf75 100644 --- a/htdocs/core/lib/prelevement.lib.php +++ b/htdocs/core/lib/prelevement.lib.php @@ -29,7 +29,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function prelevement_prepare_head($object) { diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index a252b361dcf..d8f814e06c3 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -29,7 +29,7 @@ * * @param Object $object Object related to tabs * @param User $user Object user - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function product_prepare_head($object, $user) { diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 3a4a2dc6035..e44b0dd413c 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function project_prepare_head($object) { @@ -113,7 +113,7 @@ function project_prepare_head($object) * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function task_prepare_head($object) { @@ -170,7 +170,7 @@ function task_prepare_head($object) /** * Prepare array with list of tabs * - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function project_admin_prepare_head() { diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index 3a5b25da295..bc0c7cae868 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -27,7 +27,7 @@ * Prepare array with list of tabs * * @param object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function propal_prepare_head($object) { diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index d2f3bf563c6..d2ff595b734 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function shipping_prepare_head($object) { @@ -85,7 +85,7 @@ function shipping_prepare_head($object) * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function delivery_prepare_head($object) { diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php index 2ebbb529407..3305f76875d 100644 --- a/htdocs/core/lib/stock.lib.php +++ b/htdocs/core/lib/stock.lib.php @@ -25,7 +25,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function stock_prepare_head($object) { diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index 164d346ac1c..62e46b7b9f7 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -29,7 +29,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function tax_prepare_head($object) { diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php index 7d58e9e01b1..ae38a1bf706 100644 --- a/htdocs/core/lib/trip.lib.php +++ b/htdocs/core/lib/trip.lib.php @@ -25,7 +25,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function trip_prepare_head($object) { diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 97354bd08ab..276efe85f02 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -27,7 +27,7 @@ * Prepare array with list of tabs * * @param Object $object Object related to tabs - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function user_prepare_head($object) { @@ -178,7 +178,7 @@ function group_prepare_head($object) /** * Prepare array with list of tabs * - * @return array Array of tabs to shoc + * @return array Array of tabs to show */ function user_admin_prepare_head() { From dc46d59d68ec791883e8d79f0afac7b93e9997b3 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 1 Sep 2014 18:24:25 +0200 Subject: [PATCH 2/3] Fix: Unsubscribe emailing not working --- ChangeLog | 1 + htdocs/public/emailing/mailing-unsubscribe.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e7c05ea3295..b66c5a981f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ For users: - Fix: debian script syntax error - Fix: error "menu param is not inside list" into pos module. - Fix: Salary payments are not reflected on the reporting sheets +- Fix: Unsubscribe emailing not working ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index 0b11ec3642b..2bf42cb4bba 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -3,6 +3,7 @@ * Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2012 Florian Henry + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -85,7 +86,7 @@ if (! empty($tag) && ($unsuscrib=='1')) $resql=$db->query($sql); //Update status communication of contact prospect - $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; + $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT sc.rowid FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG); $resql=$db->query($sql); From cc858b2af001679fc995e5b4ce18edfdac4e02be Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 1 Sep 2014 22:41:36 +0200 Subject: [PATCH 3/3] Fix SQL syntax ChangeLog --- ChangeLog | 1 + htdocs/admin/limits.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b66c5a981f1..be220bb0220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ For users: - Fix: error "menu param is not inside list" into pos module. - Fix: Salary payments are not reflected on the reporting sheets - Fix: Unsubscribe emailing not working +- Fix: Trigger on create category call failed because user is not passed on card ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 781bc24aa09..1f07743b402 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -204,9 +204,9 @@ else // Add vat rates examples specific to country $vat_rates=array(); - $sql.="SELECT taux as vat_rate"; + $sql="SELECT taux as vat_rate"; $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; - $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux != 0"; + $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux <> 0"; $sql.=" ORDER BY t.taux ASC"; $resql=$db->query($sql); if ($resql)