diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index a8fe5bab327fbdf31005913829db8a1696830215..b5bf993f0ca7a59f944f629d138e5a6952f2cb2c 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author (c)2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+# \author (c)2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
#
# This is list of constant you can set to have generated packages moved into a specific dir:
#DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -15,8 +15,12 @@
use Cwd;
+
+# Change this to defined target for option 98 and 99
$PROJECT="dolibarr";
-$RPMSUBVERSION="auto"; # auto use value found into BUILD
+$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
+$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+
@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
%REQUIREMENTPUBLISH=(
@@ -41,6 +45,7 @@ $RPMSUBVERSION="auto"; # auto use value found into BUILD
"makensis.exe"=>"NSIS"
);
+$RPMSUBVERSION="auto"; # auto use value found into BUILD
if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat
if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
@@ -59,8 +64,6 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
$SOURCE="$DIR/..";
$DESTI="$SOURCE/build";
-$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files";
if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
{
print "Error: Missing environment variables.\n";
@@ -210,9 +213,9 @@ else {
printf(" %2d - %-14s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
}
$cpt=98;
- printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+ printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".$REQUIREMENTPUBLISH{"ASSO"});
$cpt=99;
- printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+ printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".$REQUIREMENTPUBLISH{"SF"});
# Ask which target to build
print "Choose one package number or several separated with space (0 - ".$cpt."): ";
@@ -1030,9 +1033,16 @@ if ($nboftargetok) {
if (! $filesize) { next; }
print "\n";
- print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-
- $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+
+ if ($target eq 'SF') {
+ $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+ print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n";
+ }
+ else
+ {
+ $destFolder="$NEWPUBLISH";
+ print "Publish file ".$file." to $NEWPUBLISH\n";
+ }
# mkdir
#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1fe0a728a22d3d1fb6ee50494ff5b4fb6a096d5d..07826c684457f759feeb49131a70afe3660eac7d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -6,6 +6,7 @@
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
* 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
@@ -110,7 +111,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped
llxHeader('',$langs->trans("Orders"),$help_url);
$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
-$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
+$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as facturee';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
// We'll need this table joined to the select in order to filter by sale
@@ -415,7 +416,7 @@ if ($resql)
// warning late icon
print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
- if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
+ if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_delivery)) < ($now - $conf->commande->client->warning_delay))
print img_picto($langs->trans("Late"),"warning");
if(!empty($objp->note_private))
{
@@ -466,7 +467,7 @@ if ($resql)
// Delivery date
print '<td align="center">';
- print dol_print_date($db->jdate($objp->date_livraison), 'day');
+ print dol_print_date($db->jdate($objp->date_delivery), 'day');
print '</td>';
// Amount HT
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index d94c2f994d7c03e523aa1e00fc0d3b102dc83078..9bc0cd6f9c3c619748a121185304392857f4e354 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -450,7 +450,8 @@ if ($id > 0 || $ref)
}
// Number of supplier order running
- if (! empty($conf->fournisseur->enabled)) {
+ if (! empty($conf->fournisseur->enabled))
+ {
if ($found) print '<br>'; else $found=1;
$result=$product->load_stats_commande_fournisseur(0,'3,4');
print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty'];
@@ -460,7 +461,8 @@ if ($id > 0 || $ref)
}
// Number of product from supplier order already received (partial receipt)
- if (! empty($conf->fournisseur->enabled)) {
+ if (! empty($conf->fournisseur->enabled))
+ {
if ($found) print '<br>'; else $found=1;
print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$product->stats_reception['qty'];
}