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/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 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'; 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(); ?> 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'); 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 +?>