From f23d826e0a50be4fc6d0970f19c18918f631bc39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Jun 2012 01:40:25 +0200 Subject: [PATCH 1/7] Fix: Bad hour --- htdocs/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 1ae1f884f95..0cad4bac8f1 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -108,7 +108,7 @@ print ''; print ''.$langs->trans("User").''.$user->getNomUrl(0).''; print ''; print ''.$langs->trans("PreviousConnexion").''; -if ($user->datepreviouslogin) print dol_print_date($user->datepreviouslogin,"dayhour"); +if ($user->datepreviouslogin) print dol_print_date($user->datepreviouslogin,"dayhour",'tzuser'); else print $langs->trans("Unknown"); print ''; print "\n"; @@ -605,4 +605,4 @@ function showWeather($totallate,$text,$options) if ($totallate > $level3) $out.=img_picto_common($text,'weather/weather-storm.png',$options); return $out; } -?> \ No newline at end of file +?> From de5612ae0bfb0b0682b2ebd74d9874fd2cb38eb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Jun 2012 13:25:13 +0200 Subject: [PATCH 2/7] Fix: Missing include --- htdocs/fourn/facture/document.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index c1adefbf93b..8e72fdb0c46 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -29,6 +29,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('bills'); From 189cba6c4191bbcfafef79935241531c46a76eb7 Mon Sep 17 00:00:00 2001 From: jfefe Date: Tue, 26 Jun 2012 13:11:04 +0200 Subject: [PATCH 3/7] Fix : use lastname to test contact ldap synchro (not name) --- htdocs/contact/class/contact.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index e9b7067853b..58356a5f386 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -1013,7 +1013,7 @@ class Contact extends CommonObject // Initialise parameters $this->id=0; $this->specimen=1; - $this->name = 'DOLIBARR'; + $this->lastname = 'DOLIBARR'; $this->firstname = 'SPECIMEN'; $this->address = '61 jump street'; $this->zip = '75000'; From 622720132dee2007b24b14ecb917b6a61a269d0b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jun 2012 01:45:54 +0200 Subject: [PATCH 4/7] Use stable url --- build/pad/pad_doliwamp.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index 31a30d2d24e..84f9d2eee96 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -94,8 +94,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to - http://www.nltechno.com/pages/dolibarrwinbin.php - http://www.nltechno.com/pages/dolibarrwinbin.php + http://www.nltechno.com/doliwamp/ + http://www.nltechno.com/doliwamp/ http://www.dolibarr.org/images/dolibarr_screenshot1.png http://www.dolibarr.org/images/dolibarr.gif http://www.dolibarr.org/files/pad_doliwamp.xml From 9edb149d2c22c146724b0a6520c5c4a468fd397c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jun 2012 01:48:25 +0200 Subject: [PATCH 5/7] Prepare 3.2 final --- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index e7ca6063c38..6d0e5cd1629 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -AppVerName=DoliWamp-3.2.0-rc +AppVerName=DoliWamp-3.2.0 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -OutputBaseFilename=DoliWamp-3.2.0-rc +OutputBaseFilename=DoliWamp-3.2.0 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 68b8866d524..b972970ef45 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="2"; -$BUILD="0-rc"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a306112108e..83bde070716 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -312,5 +312,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 88991dcebbb..0d500a966f8 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -368,5 +368,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 86a570cdd91..d97d7d6bd93 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -301,5 +301,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 512f7a021a7..d0bea205fb5 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -306,5 +306,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 - Initial version (#723326) From 57958e25bf4e26154be4a7afd9cefc78ea628f37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jun 2012 02:21:59 +0200 Subject: [PATCH 6/7] Prepare 3.2 release --- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 83bde070716..a306112108e 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -312,5 +312,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 0d500a966f8..88991dcebbb 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -368,5 +368,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index d97d7d6bd93..86a570cdd91 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -301,5 +301,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index d0bea205fb5..512f7a021a7 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -306,5 +306,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.4 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) From 8d0cafc687d9eed21fe3023362102608fd2c6137 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 2 Jul 2012 10:14:01 +0200 Subject: [PATCH 7/7] Fix: sql request error --- htdocs/expedition/index.php | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index bb635323c85..619e48405f7 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -222,23 +222,17 @@ else dol_print_error($db); /* * Last shipments */ -$clause = " WHERE "; - $sql = "SELECT e.rowid, e.ref"; $sql.= ", s.nom, s.rowid as socid"; $sql.= ", c.ref as commande_ref, c.rowid as commande_id"; $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.sourcetype in ('commande')"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.sourcetype IN ('commande')"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.targettype IN ('shipping')"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; -if (!$user->rights->societe->client->voir && !$socid) -{ - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; - $sql.= $clause." sc.fk_user = " .$user->id; - $clause = " AND "; -} -$sql.= $clause." e.fk_statut = 1"; -$sql.= " AND e.entity = ".$conf->entity; +if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; +$sql.= " WHERE e.entity = ".$conf->entity; +if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id; +$sql.= " AND e.fk_statut = 1"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; $sql.= " ORDER BY e.date_delivery DESC"; $sql.= $db->plimit(5, 0); @@ -258,7 +252,7 @@ if ($resql) { $var=!$var; $obj = $db->fetch_object($resql); - print "rowid\">".img_object($langs->trans("ShowSending"),"sending").' '; + print ''.img_object($langs->trans("ShowSending"),"sending").' '; print $obj->ref.''; print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; print ''; @@ -280,8 +274,7 @@ else dol_print_error($db); print ''; -$db->close(); llxFooter(); - +$db->close(); ?>