From a4fe6a40bfb1b5c4f47008b1bba608259178fb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 1 Jul 2013 17:45:44 +0200 Subject: [PATCH 1/4] Fixed missing class include --- htdocs/adherents/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 27b3403efa0..fd10d0e14de 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -27,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; $langs->load("companies"); $langs->load("members"); From 154daa06574cd159b091a25251a58aae400416cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2013 21:52:09 +0200 Subject: [PATCH 2/4] Fix: css --- htdocs/theme/amarok/style.css.php | 3 ++- htdocs/theme/auguria/style.css.php | 3 ++- htdocs/theme/bureau2crea/style.css.php | 3 ++- htdocs/theme/cameleo/style.css.php | 3 ++- htdocs/theme/eldy/style.css.php | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 0428b87081c..5057f18731c 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -250,7 +250,8 @@ input.flat { input:disabled {background:#b6b6b6;} input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } -input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } input:-webkit-autofill { background-color: !important; background-image:none !important; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index b94a7f6120d..8e621d30828 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -142,7 +142,8 @@ textarea:disabled { background:#ddd; } input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } -input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } input:-webkit-autofill { background-color: !important; background-image:none !important; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 71f4a87f037..2acb9f99ec8 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -155,7 +155,8 @@ textarea:disabled { } input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } -input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } input:-webkit-autofill { background-color: !important; background-image:none !important; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index e4e17e13c36..f5a8a0f053f 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -125,7 +125,8 @@ textarea:disabled { } input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } -input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } input:-webkit-autofill { background-color: !important; background-image:none !important; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 926798586ea..3f23442ea4c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -279,7 +279,8 @@ textarea:disabled { background:#ddd; } input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } -input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } input:-webkit-autofill { background-color: !important; background-image:none !important; From fb753cd8ce5aa40aef57dcf1412e3e52c3a50af7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2013 22:36:23 +0200 Subject: [PATCH 3/4] Fix: Do not send remind to pay invoice for abandonned invoice --- .../email_unpaid_invoices_to_customers.php | 12 +++++------ ...ail_unpaid_invoices_to_representatives.php | 20 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index c92a51d85db..fcb38e47006 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -64,12 +64,12 @@ $error = 0; print $script_file." launched with mode ".$mode.($duration_value>=0?" delay=".$duration_value:"")."\n"; $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang"; -$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; -$sql .= " , ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE f.fk_statut != 0 AND f.paye = 0"; -$sql .= " AND f.fk_soc = s.rowid"; -if ($duration_value>=0) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; -$sql .= " ORDER BY s.email ASC, s.rowid ASC"; // Order by email to allow one message per email +$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; +$sql.= " , ".MAIN_DB_PREFIX."societe as s"; +$sql.= " WHERE f.fk_statut = 1 AND f.paye = 0"; +$sql.= " AND f.fk_soc = s.rowid"; +if ($duration_value>=0) $sql.= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; +$sql.= " ORDER BY s.email ASC, s.rowid ASC"; // Order by email to allow one message per email //print $sql; $resql=$db->query($sql); diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 6b050ec7f71..266a364b8dd 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -64,16 +64,16 @@ $error = 0; print $script_file." launched with mode ".$mode.($duration_value>=0?" delay=".$duration_value:"")."\n"; $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; -$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; -$sql .= " , ".MAIN_DB_PREFIX."societe as s"; -$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc"; -$sql .= " , ".MAIN_DB_PREFIX."user as u"; -$sql .= " WHERE f.fk_statut != 0 AND f.paye = 0"; -$sql .= " AND f.fk_soc = s.rowid"; -if ($duration_value>=0) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; -$sql .= " AND sc.fk_soc = s.rowid"; -$sql .= " AND sc.fk_user = u.rowid"; -$sql .= " ORDER BY u.email ASC, s.rowid ASC"; // Order by email to allow one message per email +$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; +$sql.= " , ".MAIN_DB_PREFIX."societe as s"; +$sql.= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +$sql.= " , ".MAIN_DB_PREFIX."user as u"; +$sql.= " WHERE f.fk_statut = 1 AND f.paye = 0"; +$sql.= " AND f.fk_soc = s.rowid"; +if ($duration_value>=0) $sql.= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; +$sql.= " AND sc.fk_soc = s.rowid"; +$sql.= " AND sc.fk_user = u.rowid"; +$sql.= " ORDER BY u.email ASC, s.rowid ASC"; // Order by email to allow one message per email //print $sql; $resql=$db->query($sql); From d09e8a522d34f5c07cc5d330292fa5e42fd7970c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jul 2013 01:05:10 +0200 Subject: [PATCH 4/4] Fix: PHPunit match previous fix of civility label empty --- test/phpunit/AdherentTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index d61b3fc6cf2..a42b7476218 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -314,7 +314,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase '%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'. '%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%'; - $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',0,New firstname,New name,New firstname New name,'. + $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'. 'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'. 'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';