lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improves the simplified payment

Browse Source 
MAIN_JS_ON_PAYMENT must be set
This commit is contained in:
cdelambert 2011-07-27 08:00:45 +00:00
parent 558040a060
commit ecd1821446
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/makepack-dolibarr.pl
View File

@ -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.116 2011/07/26 22:53:13 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.117 2011/07/26 23:25:59 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="$PROJECT_$MAJOR.$MINOR.$BUILD";
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") {
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.117 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -458,8 +458,8 @@ if ($nboftargetok) {
# now newbuild is 0-1 or 0-4 for example
print "Version is $MAJOR.$MINOR.$newbuild\n";
print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb");
print "Remove target ${FILENAMEDEB}_all.deb...\n";
unlink("$DESTI/${FILENAMEDEB}_all.deb");
#rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;

7
htdocs/compta/bank/rappro.php
View File

@ -14,14 +14,15 @@
* 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/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/compta/bank/rappro.php
* \ingroup banque
* \brief Page to reconciliate bank transactions
* \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
* \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
*/
require("./pre.inc.php");
@ -402,5 +403,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
?>

4
htdocs/langs/ca_ES/admin.lang
View File

@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
DaylingSavingTime=Horari d'estiu (usuari)
CurrentHour=Hora PHP (servidor)
CompanyTZ=Zona Horària empresa (casa mare)
CompanyHour=Hora empresa (casa mare)
CompanyTZ=Zona Horària empresa (seu central)
CompanyHour=Hora empresa (seu central)
CurrentSessionTimeOut=Time out sessió actual
OSEnv=Entorn SO
Box=Panell

4
htdocs/langs/es_ES/admin.lang
View File

@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
DaylingSavingTime=Horario de verano (usuario)
CurrentHour=Hora PHP (servidor)
CompanyTZ=Zona Horaria empresa (casa madre)
CompanyHour=Hora empresa (casa madre)
CompanyTZ=Zona Horaria empresa (sede central)
CompanyHour=Hora empresa (sede central)
CurrentSessionTimeOut=Time out sesión actual
OSEnv=Entorno SO
Box=Panel