From e192e90ed1d77eea811a342c512c5bb7de472beb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH] Fix: Do not close automatically deposits --- build/makepack-dolibarr.pl | 12 +++++++----- build/makepack-howto.txt | 7 +++---- htdocs/langs/en_US/bills.lang | 2 +- htdocs/langs/fr_FR/bills.lang | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 100644 --- 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) -# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$PROJECT.tmp"; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; + $ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`; + print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT\n"; + print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 5d7afe36847..f8383f013ed 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -19,10 +19,9 @@ beta version of Dolibarr, step by step. - Add a CVS Tag (DOLIBARR_x_y_BETA) - Create a branch (DOLIBARR_x_y_BRANCH). -- Update the CVS on server that build automatically the tgz beta package - or build Dolibarr and DoliWamp with makepack-dolibarr.pl -- Enable entries on joomla web site www.dolibarr.org with links - that point to that file ("Dolibarr CVS snapshot of current beta"). +- Run makepack-dolibarr.pl to generate all packages. +- Enable the category that point to the beta files on joomla + web site www.dolibarr.org - Post a news on dolibarr.org/dolibarr.fr - Send mail on mailings-list diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 3918702c260..93e3b307c3a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -366,7 +366,7 @@ DisabledBecausePayments=Not possible since there is some payments CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed ExpectedToPay=Expected payment PayedByThisPayment=Payed by this payment -ClosePaidInvoicesAutomatically=Classify "Payed" all invoices entierely payed. +ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed. AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 3e510424795..0176649a21c 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -366,7 +366,7 @@ DisabledBecausePayments=Non disponible car il existe des paiements CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée. ExpectedToPay=Paiement attendu PayedByThisPayment=Règlé par ce paiement -ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures entièrement payées. +ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures standards et de remplacement entièrement payées. AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé". ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client