Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.2.0", "3.1.0", "3.0.1", "2.9.0" );
+return ( "3.2.0", "3.1.1", "3.0.1", "2.9.0" );
 }
 
 sub script_dolibarr_category
@@ -43,13 +43,6 @@ sub script_dolibarr_php_vers
 return ( 5 );
 }
 
-sub script_dolibarr_php_vars
-{
-return ( [ 'memory_limit', '64M', '+' ],
-	[ 'upload_max_filesize', '10M', '+' ],
-	[ 'max_execution_time', '60', '+' ] );
-}
-
 sub script_dolibarr_php_modules
 {
 local ($d, $ver, $phpver, $opts) = @_;
@@ -348,21 +341,32 @@ if ($opts->{'newdb'}) {
 return (1, "Dolibarr directory and tables deleted.");
 }
 
-# script_dolibarr_latest(version)
+# script_dolibarr_realversion(&domain, &opts)
-# Returns a URL and regular expression or callback func to get the version
+# Returns the real version number of some script install, or undef if unknown
-sub script_dolibarr_latest
+sub script_dolibarr_realversion
+{
+local ($d, $opts, $sinfo) = @_;
+local $lref = &read_file_lines("$opts->{'dir'}/filefunc.inc.php", 1);
+foreach my $l (@$lref) {
+		if ($l =~ /'DOL_VERSION','([0-9a-z\.\-]+)'/) {
+                return $1;
+                }
+        }
+return undef;
+}
+
+# script_dolibarr_check_latest(version)
+# Checks if some version is the latest for this project, and if not returns
+# a newer one. Otherwise returns undef.
+sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
-if ($ver >= 3.0) {
+local @vers = &osdn_package_versions("dolibarr",
-	return ( "http://sourceforge.net/projects/dolibarr/files/".
+                $ver >= 3 ? "dolibarr\\-(3\\.[0-9\\.]+)\\.tgz" :
-		  "Dolibarr%20ERP-CRM",
+                $ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
-		  "(3\\.[0-9\\.]+)" );
+                              "dolibarr\\-(2\\.8\\.[0-9\\.]+)\\.tgz");
-	}
+return "Failed to find versions" if (!@vers);
-elsif ($ver >= 2.9) {
+return $ver eq $vers[0] ? undef : $vers[0];
-	return ( "http://www.dolibarr.fr/files/stable/",
-		 "dolibarr\\-(2\\.[0-9\\.]+)" );
-	}
-return ( );
 }
 
 sub script_dolibarr_site
@@ -376,4 +380,3 @@ return 2;
 }
 
 1;
-

htdocs/expedition/tpl/linkedobjectblock.tpl.php

@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+$langs->load("sendings");
+echo '<br>';
+print_titre($langs->trans('RelatedShippings'));
+
+?>
+<table class="noborder allwidth">
+<tr class="liste_titre">
+	<td><?php echo $langs->trans("Ref"); ?></td>
+	<td align="center"><?php echo $langs->trans("Date"); ?></td>
+	<td align="center"><?php echo $langs->trans("DateSendingShort"); ?></td>
+	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
+	<td align="right"><?php echo $langs->trans("Status"); ?></td>
+</tr>
+<?php
+$var=true;
+foreach($linkedObjectBlock as $object)
+{
+	$var=!$var;
+?>
+<tr <?php echo $GLOBALS['bc'][$var]; ?> ><td>
+	<a href="<?php echo DOL_URL_ROOT.'/expedition/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowShipping"),"sending").' '.$object->ref; ?></a></td>
+	<td align="center"><?php echo dol_print_date($object->date_creation,'day'); ?></td>
+	<td align="center"><?php echo dol_print_date($object->date_delivery,'day'); ?></td>
+	<td align="right"><?php echo price($object->total_ht); ?></td>
+	<td align="right"><?php echo $object->getLibStatut(3); ?></td>
+</tr>
+<?php
+$total = $total + $object->total_ht;
+}
+
+?>
+<tr class="liste_total">
+	<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
+	<td align="right"><?php echo price($total); ?></td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+<!-- END PHP TEMPLATE -->

htdocs/langs/en_US/sendings.lang

@@ -57,6 +57,7 @@ SendShippingRef=Send shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+RelatedShippings=Related shippings
 
 # Sending methods
 SendingMethodCATCH=Catch by customer

htdocs/langs/fr_FR/sendings.lang

@@ -57,6 +57,7 @@ SendShippingRef=Envoi bon d'expédition %s
 ActionsOnShipping=Événements sur l'expédition
 LinkToTrackYourPackage=Lien pour suivi de votre colis
 ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande.
+RelatedShippings=Expédition(s) associée(s)
 
 # Sending methods
 SendingMethodCATCH=Enlèvement par le client