Fix: Avoid errors into rpm packages

This commit is contained in:
Laurent Destailleur 2011-08-03 00:45:22 +00:00
parent f5689272d4
commit 89b22409fd
341 changed files with 1586 additions and 2715 deletions

View File

@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...).
# lintian --pedantic -E -I package.deb To test a package
#
# dpkg -l List all packages
# dpkg -b To build package
# dpkg -b To build binary only package
# dpkg -c package.deb List content of package
# dpkg -I package.deb Give informations on package
# dpkg -i package.deb Install a package
#
# dpkg-reconfigure -plow package Reconfigure package
# dpkg -L packagename List content of installed package
# dpkg -r packagename Remove config files and interactive saved answers
# dpkg --purge Remove config files and interactive saved answers
#
# dpkg-buildpackage -us -uc Build a source and binary package

View File

@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
* New upstream release.
closes: bug#634783
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
-- Dolibarr team <contact@dolibarr.org> Mon, 30 Jul 2011 12:00:00 +0100
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.

View File

@ -1,46 +0,0 @@
Package: dolibarr
Version: __VERSION__
Architecture: all
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Installed-Size: 61200
Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Description: Easy to use web based ERP & CRM software
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
Dolibarr was designed to provide only features you need and be easy to use.
.
Only features you need are visible, depending on which module were activated.
Most common used modules are:
.
Customers, Suppliers or Prospects directory,
Contacts directory,
Orders management,
Commercial proposals management,
Invoices management,
Products and services catalog,
Stock management,
Foundations members management,
Bank accounts management,
Point of Sale,
Payments management,
Commercial actions management,
Contracts management,
Standing orders management,
Shipping management,
Donations management,
Bookmarks management,
Mass Emailings,
Reports,
Wizards to export and import data,
LDAP connectivity,
PDF exports,
And a lot of more modules...
.
You can also add third parties external modules or develop yours.

View File

@ -4,10 +4,16 @@ Standards-Version: 3.9.1
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Build-Depends: debhelper, po-debconf
Build-Depends: debhelper (>= 7), po-debconf
Package: dolibarr
Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
php5-mysql | php5-mysqli,
php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
${misc:Depends}, xdg-utils,
mysql-server, perl
Recommends: apache2 | lighttpd | httpd, mysql-client
Suggests: www-browser
Architecture: all
Section: web
Priority: optional

View File

@ -3,10 +3,14 @@
# It must be saved into directory /usr/share/applications
Version=1.0
Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
# Command to open an URL
# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser

View File

@ -1,4 +1,5 @@
etc/dolibarr/apache.conf
etc/dolibarr/lighttpd.conf
usr/share/applications/dolibarr.desktop
usr/share/doc/dolibarr
usr/share/dolibarr

View File

@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-27 19:49+0200\n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"PO-Revision-Date: 2011-07-29 22:45+0100\n"
"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@ -25,10 +25,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Project-Id: dolibarr\n"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr "Seveur web à reconfigurer automatiquement:"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
msgstr ""
"Selectionnez le serveur web à configurer automatiquement pour utiliser "
"dolibarr."
#
#. Type: boolean
#. Description
#: ../templates:1001
#: ../templates:2001
#, fuzzy
msgid "Delete database and uploaded files ?"
msgstr "Effacer la base de donnée et les fichiers uploadés ?"
@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
#
#. Type: boolean
#. Description
#: ../templates:1001
#: ../templates:2001
#, fuzzy
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-27 19:52+0200\n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,15 +17,29 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
#. Type: multiselect
#. Description
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr ""
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
msgstr ""
#. Type: boolean
#. Description
#: ../templates:2001
msgid "Delete database and uploaded files ?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates:1001
#: ../templates:2001
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "
"datas (datas related to this question are the Dolibarr DBMS account, all "

View File

@ -1,7 +1,5 @@
#!/bin/sh
# postinst script for dolibarr
#
# see: dh_installdeb(1)
set -e
@ -16,6 +14,31 @@ set -e
# for details, see /usr/share/doc/packaging-manual/
lighttpd_install() {
if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
if which lighty-enable-mod >/dev/null 2>&1 ; then
echo "Add link for Lighttpd config file"
ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
# We enabled it
lighty-enable-mod dolibarr fastcgi-php
else
echo "Lighttpd not installed, skipping"
fi
fi
}
apache_install() {
webserver=$1
if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Add link for Apache config file"
ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
fi
}
. /usr/share/debconf/confmodule
db_version 2.0
@ -27,8 +50,6 @@ echo Run the dolibarr postinst script
# Define vars
docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
installconfig="/etc/dolibarr/install.forced.php"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
@ -44,10 +65,6 @@ case "$1" in
chmod -R 775 $docdir
chmod -R g+s $docdir
# Copy apache.conf file into target directory
#mkdir -p /etc/dolibarr
#cp -p $apachefileorig $apacheconfig
# Copy install config file (with matching Debian) values into target directory
superuserlogin=''
superuserpassword=''
@ -74,21 +91,15 @@ case "$1" in
chmod -R 660 $config
fi
# Get the web server type (use db_get for interactive mode).
#db_reset "dolibarr/webserver"
#db_get "dolibarr/webserver" # Read value for webserver.
#webserver="$RET"
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
db_get dolibarr/reconfigure-webserver
webservers="$RET"
# Set up web server.
for server in $webservers ; do
echo Complete config of server $server
for webserver in $webservers ; do
webserver=${webserver%,}
echo Complete config of server $webserver
# Detect webuser and webgroup
webuser=
@ -106,26 +117,31 @@ case "$1" in
# Set permissions to web server
chown -R $webuser:$webgroup /usr/share/dolibarr
chown -R root:$webgroup $config
# Add link to config file
echo Setup web server $server to add dolibarr config file
ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf
done
# Restart servers
servers="apache2-ssl apache2 mysql"
# Another way to restart
for server in $servers ; do
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $server reload || true
else
echo Restart web server $server using $server reload
/etc/init.d/$server reload || true
fi
# Restart web server.
for webserver in $webservers; do
webserver=${webserver%,}
if [ "$webserver" = "lighttpd" ] ; then
lighttpd_install
else
apache_install $webserver
fi
# Reload webserver in any case, configuration might have changed
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $webserver reload 3>/dev/null || true
else
echo Restart web server $server using $server reload
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi
done
echo ----------
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
@ -136,13 +152,13 @@ case "$1" in
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
echo "postinst called with unknown argument $1" >&2
exit 0
;;
esac
db_stop
#DEBHELPER#
db_stop
exit 0

View File

@ -17,7 +17,36 @@ set -e
# for details, see /usr/share/doc/packaging-manual/
. /usr/share/debconf/confmodule
lighttpd_remove() {
if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
echo "Remove link for Lighttpd config file"
rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
if which lighty-enable-mod >/dev/null 2>&1 ; then
lighty-disable-mod dolibarr
else
echo "Lighttpd not installed, skipping"
fi
# See bug #448682
if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
echo 'Manually deleting lighttpd/dolibarr configuration link'
rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
fi
fi
}
apache_remove() {
if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Remove link for Apache config file"
rm -f /etc/$webserver/conf.d/dolibarr.conf
fi
}
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
db_version 2.0
@ -26,63 +55,62 @@ echo Run the dolibarr postrm script
docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="/etc/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock"
export webserver=""
# Allows us to loop and substitute in one pass
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
case "$1" in
# Call when we upgrade
upgrade)
echo "postrm upgrade"
;;
# Call when we uninstall
remove)
echo "postrm remove"
rm -f $lockfile
# Remove include files
export restart=""
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete link $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ;
then restart="$restart $server"
# Reconfigure web server
db_get dolibarr/reconfigure-webserver
webservers="$RET"
# Restart web servers
for webserver in $webservers; do
webserver=${webserver%,}
if [ "$webserver" = "lighttpd" ] ; then
lighttpd_remove
else
apache_remove $webserver
fi
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $webserver reload 3>/dev/null || true
else
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi
done
;;
# Call when we uninstall and purge
purge)
echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
echo "postrm purge"
# Ask if we must delete database
echo "postrm db_input dolibarr/postrm"
db_input critical "dolibarr/postrm" || true
db_input critical dolibarr/postrm || true
db_go || true
echo "postrm db_get dolibarr/postrm"
# We disable set -e to avoid premature end of script if error
set +e
db_get "dolibarr/postrm"
db_get dolibarr/postrm
set -e
if [ "$RET" = "true" ] ; then
@ -185,41 +213,12 @@ case "$1" in
echo "postrm Delete of dolibarr database and uploaded files not wanted"
fi
# Remove include files
export restart=""
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete file $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ;
then restart="$restart $server"
fi
done
rm -rf /etc/dolibarr
# Restart servers
for server in $restart ; do
# We disable blocking errors
set +e
echo "Restart server $server if exists"
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $server reload || true
else
/etc/init.d/$server reload || true
fi
# We restore blocking errors
set -e
done
# We clean variable (we ignore errors because db_reset can fails if var was never set)
set +e
db_reset "dolibarr/postrm"
db_reset dolibarr/reconfigure-webserver
db_reset dolibarr/postrm
set -e
#db_purge
@ -229,7 +228,7 @@ case "$1" in
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
echo "postrm called with unknown argument $1" >&2
exit 0
;;
esac

View File

@ -1,3 +1,10 @@
Template: dolibarr/reconfigure-webserver
Type: multiselect
Choices: apache2, lighttpd
_Description: Web server to reconfigure automatically:
Please choose the web server that should be automatically configured
to run dolibarr.
Template: dolibarr/postrm
Type: boolean
Default: true

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.128 2011/07/31 22:08:13 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -318,6 +318,9 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
}
# Build package for each target
@ -569,6 +572,8 @@ if ($nboftargetok) {
if ($target eq 'DEB')
{
$olddir=getcwd();
$newbuild = $BUILD;
$newbuild =~ s/(dev|alpha)/1/gi; # dev
$newbuild =~ s/beta/2/gi; # beta
@ -671,19 +676,22 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache conf files
# Apache and lighttpd conf files
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
# Dolibarr conf files
# TODO
print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`;
# dolibarr.desktop
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
@ -729,17 +737,15 @@ if ($nboftargetok) {
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
print "Go to directory $BUILDROOT\n";
$olddir=getcwd();
chdir("$BUILDROOT");
# Creation of binary package (to build without sources)
# Creation of binary package (to build without sources)
#print "Go to directory $BUILDROOT\n";
#chdir("$BUILDROOT");
#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
#print "Launch DEB build ($cmd)\n";
#$ret=`$cmd`;
#print $ret."\n";
# Creation of source package
# Prepare source package
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
@ -751,6 +757,7 @@ if ($nboftargetok) {
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
$ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`;
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
@ -766,6 +773,9 @@ if ($nboftargetok) {
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$ret=`$cmd`;
# Creation of source package
print "Go to directory $BUILDROOT\n";
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc";

View File

@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...).
# This is standard command to work on Debian packaging:
#
# rpmlint file.rpm Test a package
#
# On Fedora
# rpm -i --test dolibarr-...rpm To list dependencies of RPM
# yum install dolibarr-...rpm To install package and dependencies
@ -42,9 +40,7 @@ different features for Enterprise Resource Planning (ERP) and Customer
Relationship Management (CRM) but also for different other activities.
I am author of other already packaged OpenSources packages (awstats) but this
is my first package to maintain myself. So i'm seeking a sponsor.
- Edit field "Block" and add FE-NEEDSPONSOR
- Check bug is into database by searching with id on https://bugzilla.redhat.com/
- Install fedora packager tools: yum install fedora-packager
- Setup fedora packagers tools: fedora-packager-setup
- Send your package: koji build --scratch f16 path_to_source_RPM
- Check if package is available: http://koji.fedoraproject.org/koji/
- Check bug is into database by searching with id on https://bugzilla.redhat.com/

View File

@ -4,13 +4,14 @@
Version=1.0
Encoding=UTF-8
Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
# Command to open an URL
# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser

View File

@ -48,7 +48,7 @@ AutoReqProv: no
%description
An easy to use CRM & ERP open source/free software for small
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to
use.
%description -l es
Un software ERP y CRM open source/gratis para pequeñas y
Dolibarr ERP y CRM es un software open source/gratis para pequeñas y
medianas empresas, asociaciones o autónomos. Incluye diferentes
funcionalidades para la Planificación de Recursos Empresariales (ERP) y
Gestión de la Relación con los Clientes (CRM) así como para para otras
@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su
facilidad de uso.
%description -l fr
Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs,
Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs,
artisans ou associations. Il permet de gérer vos clients, prospect,
fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
et bien d'autres choses dans une interface pensée pour la simplicité.
%description -l it
Un programma gestionale open source e gratuito per piccole e medie
Dolibarr è un programma gestionale open source e gratuito per piccole e medie
imprese, fondazioni e liberi professionisti. Include varie funzionalità per
Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno
@ -101,7 +101,6 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
# %{_datadir} = /usr/share
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock"
@ -221,7 +218,7 @@ then
chmod -R 660 $config
fi
# Create config file for apache $apacheconfig
# Create a config file $apacheconfig
if [ ! -f $apacheconfig ]; then
echo Create dolibarr web server config file $apacheconfig
cp $apachefileorig $apacheconfig
@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then
chmod go-w $apacheconfig
fi
# Create config file for se $seconfig
if [ ! -f $seconfig ]; then
echo Create se config file $seconfig
cp $sefileorig $seconfig
# chmod a-x $apacheconfig
# chmod go-w $apacheconfig
fi
# Create a config link dolibarr.conf
# Create a config link dolibarr.conf for Fedora or Redhat
if [ ! -f $apachelink ]; then
echo Create dolibarr web server config link $apachelink
ln -fs $apacheconfig $apachelink
@ -370,5 +359,5 @@ rmdir $targetdir/doc >/dev/null 2>&1
#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm
%changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
- Initial version (#723326)
* Wed Jul 31 2011 Laurent Destailleur 3.1.0
- Initial upstream (#723326)

View File

@ -1,3 +1,3 @@
/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0

View File

@ -27,7 +27,7 @@
* \file htdocs/includes/modules/modMyModule.class.php
* \ingroup mymodule
* \brief Description and activation file for module MyModule
* \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
* \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
*/
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='generic';
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
$this->triggers = 0;
// Data directories to create when module is enabled.

View File

@ -20,7 +20,7 @@
/**
* \file htdocs/admin/boxes.php
* \brief Page to setup boxes
* \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
* \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
*/
require("../main.inc.php");
@ -278,7 +278,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{
@ -394,7 +394,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{
@ -470,5 +470,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
?>

View File

@ -3,7 +3,7 @@
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2011 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
@ -22,7 +22,7 @@
/**
* \file htdocs/admin/modules.php
* \brief Page to activate/disable all modules
* \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
* \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
*/
require("../main.inc.php");
@ -79,12 +79,35 @@ $modules = array();
$orders = array();
$categ = array();
$dirmod = array();
$modulesdir = array();
$i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined.
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/";
foreach ($conf->file->dol_document_root as $type => $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$althandle=@opendir($dirroot);
if (is_resource($althandle))
{
while (($file = readdir($althandle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
}
}
}
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
dol_syslog("Scan directory ".$dir." for modules");
@ -449,5 +472,5 @@ print '</div>';
$db->close();
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
?>

View File

@ -21,7 +21,7 @@
* \file htdocs/admin/perms.php
* \ingroup core
* \brief Page d'administration/configuration des permissions par defaut
* \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
* \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
*/
require("../main.inc.php");
@ -76,10 +76,34 @@ $db->begin();
// Charge les modules soumis a permissions
$modules = array();
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/";
$modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
@ -194,5 +218,5 @@ print '</div>';
$db->close();
llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
?>

View File

@ -12,14 +12,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/admin/proxy.php
* \ingroup core
* \brief Page setup proxy to use for external web access
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
*/
require("../main.inc.php");
@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);
$db->close();
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
?>

View File

@ -13,14 +13,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/admin/security_other.php
* \ingroup core
* \brief Security options setup
* \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
* \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
*/
require("../main.inc.php");
@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
$db->close();
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
?>

View File

@ -14,13 +14,14 @@
* 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/admin/system/constall.php
* \brief Page to show all Dolibarr setup (config file and database constants)
* \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
* \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
*/
require("../../main.inc.php");

View File

@ -17,10 +17,10 @@
*/
/**
* \file htdocs/boutique/index.php
* \ingroup boutique
* \brief Page accueil zone boutique
* \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $
\file htdocs/boutique/index.php
\ingroup boutique
\brief Page accueil zone boutique
\version $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $
*/
require("../main.inc.php");
@ -238,5 +238,5 @@ print '</tr></table>';
$dbosc->close();
llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $');
?>

View File

@ -22,7 +22,7 @@
* \brief File of class to manage widget boxes
* \author Rodolphe Qiedeville
* \author Laurent Destailleur
* \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
* \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
*/
@ -220,7 +220,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
}
else
{
@ -281,7 +281,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{

View File

@ -11,11 +11,10 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* \version $Id$ */
/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */
body {
background: #eee;

View File

@ -12,8 +12,7 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Instanciation et initialisation de l'objet xmlhttprequest

View File

@ -15,8 +15,7 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@ -63,11 +62,13 @@ $logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->them
print '<div class="menu_bloc">';
print '<ul class="menu">';
// Link to new sell
print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
// Open new tab on backoffice (this is not a disconnect from POS)
print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>';
// Disconnect
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'];
print ' <a href="deconnexion.php">'.$logout.'</a><br>';
print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
/*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';

View File

@ -15,8 +15,7 @@ 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, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php
<?php
switch ($obj_facturation->mode_reglement())
{
{
case 'ESP':
echo $langs->trans("Cash");
$filtre='courant=2';
@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
echo $langs->trans("CreditCard");
$filtre='courant=1';
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
break;
case 'CHQ':
echo $langs->trans("Cheque");
@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
echo $langs->trans("Reported");
$filtre='courant=1 OR courant=2';
$selected='';
break;
break;
default:
$filtre='courant=1 OR courant=2';
$selected='';
}
?>
</td></tr>
<?php
<?php
// Affichage des infos en fonction du mode de paiement
if ( $obj_facturation->mode_reglement() == 'DIF' ) {
@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<p class="note_label">
<?php
<?php
echo $langs->trans("BankToPay"). "<br>";
$html = new Form($db);
$html->select_comptes($selected,'cashdeskbank',0,$filtre);
$html->select_comptes($selected,'cashdeskbank',0,$filtre);
?>
</p>
<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>

View File

@ -12,8 +12,7 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo
// from text inputs : total amount
$amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment)
: ''
)
)
: ''; // keep void if not a valid entry
// Checkamounts
foreach ($amounts as $key => $value)
@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown
// Get the current amount (from form) and the corresponding remainToPay (from invoice)
$currentAmount = $amounts['amount_'.$currentInvId];
$currentRemain = $remains['remain_'.$currentInvId];
// If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment
if($amountPayment == '')
{
@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown
$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
$result += $remainAmount; // result must be deduced by
$currentAmount += $remainAmount; // curAmount put to curRemain
}else
}else
{
$currentAmount = $currentRemain;
$result += $currentRemain;
}
}else
}
}else
{
// Reset the substraction for this amount
$result += price2num($currentAmount);
$currentAmount = 0;
if($result >= 0) // then we need to calculate the amount to breakdown
{
$amountToBreakdown = ($result - $currentRemain >= 0 ?

View File

@ -15,14 +15,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/bankid_fr.php
* \ingroup banque
* \brief Fiche creation compte bancaire
* \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
* \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
*/
require("./pre.inc.php");
@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
$db->close();
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
?>

View File

@ -15,14 +15,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/fiche.php
* \ingroup banque
* \brief Page to create/view a bank account
* \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
* \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
*/
require("./pre.inc.php");
@ -607,5 +608,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
?>

View File

@ -14,15 +14,14 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/index.php
* \ingroup compta
* \brief Main page of accountancy area
* \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
* \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $
*/
require('../main.inc.php');
@ -1032,5 +1031,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $');
?>

View File

@ -16,15 +16,14 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/paiement.php
* \ingroup compta
* \brief Page to create a payment
* \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
* \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $
*/
require('../main.inc.php');
@ -673,5 +672,5 @@ if (! GETPOST('action'))
$db->close();
llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $');
llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $');
?>

View File

@ -15,13 +15,14 @@
* 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/prelevement/create.php
* \brief Prelevement
* \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
* \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
*/
require("../bank/pre.inc.php");
@ -275,5 +276,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
?>

View File

@ -23,15 +23,14 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/html.form.class.php
* \ingroup core
* \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $
* \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $
*/
@ -161,8 +160,10 @@ class Form
$htmltext=str_replace("\n","",$htmltext);
$htmltext=str_replace('"',"&quot;",$htmltext);
$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
$paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
$s="";
if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';

View File

@ -14,15 +14,14 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/interfaces.class.php
* \ingroup core
* \brief Fichier de la classe de gestion des triggers
* \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
* \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $
*/

View File

@ -20,14 +20,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/filefunc.inc.php
* \ingroup core
* \brief File that include conf.php file and functions.lib.php
* \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
*/
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
# For debian/redhat like systems
# For debian like systems
#$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php";

View File

@ -13,7 +13,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
@ -21,7 +20,7 @@
* \ingroup export
* \brief File of class to build exports with CSV format
* \author Laurent Destailleur
* \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
* \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports
$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
$this->extension='csv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto
$ver=explode(' ','$Revision: 1.30 $');
$ver=explode(' ','$Revision: 1.31 $');
$this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here

View File

@ -13,7 +13,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
@ -21,7 +20,7 @@
* \ingroup export
* \brief File of class to generate export file with Excel format
* \author Laurent Destailleur
* \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
* \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports
$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
$this->extension='xls'; // Extension for generated file by this driver
$this->picto='mime/xls'; // Picto
$ver=explode(' ','$Revision: 1.27 $');
$ver=explode(' ','$Revision: 1.28 $');
$this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here

View File

@ -12,9 +12,7 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -22,7 +20,7 @@
* \ingroup export
* \brief File of class to build export files with format TSV
* \author Laurent Destailleur
* \version $Id$
* \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports
$this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].';
$this->extension='tsv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto
$ver=explode(' ','$Revision$');
$ver=explode(' ','$Revision: 1.14 $');
$this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here

View File

@ -14,14 +14,13 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
* \file htdocs/includes/modules/export/modules_export.php
* \ingroup export
* \brief File of parent class for export modules
* \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
* \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');

View File

@ -19,7 +19,7 @@
/**
* \defgroup workflow Module workflow
* \brief Workflow management
* \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
* \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $
*/
/**
@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='technic';
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
$this->triggers = 1;
// Data directories to create when module is enabled

File diff suppressed because it is too large Load Diff

View File

@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
License along with this library; If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.

View File

@ -14,13 +14,14 @@
* 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/index.php
* \brief Dolibarr home page
* \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $
* \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
*/
define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site.
@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
$db->close();
llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $');
llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
/**

View File

@ -12,10 +12,9 @@
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $
*/
body {

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -18,10 +18,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -11,10 +11,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $
-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -18,10 +18,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $
-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $
--
--
@ -34,4 +33,4 @@
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0);

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -18,10 +18,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $
-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
--
--

View File

@ -17,10 +17,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $
--
--

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $
--
-- ============================================================================

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $
-- ===========================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- Table of "accounts" for accountancy expert module
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $
-- Table of "records" for accountancy expert module
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $
-- Table of "Plan de comptes" for accountancy expert module
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $
-- Table of "transactions" for accountancy expert module (1 transaction = 2+ records)
-- ============================================================================

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $
-- ===========================================================================

View File

@ -14,10 +14,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $
--
-- Actions commerciales
-- ========================================================================

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $
-- ============================================================================

View File

@ -15,10 +15,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $
-- ===================================================================
--
-- statut

View File

@ -15,10 +15,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $
-- ===================================================================

View File

@ -14,10 +14,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $
-- ===================================================================
create table llx_adherent_extrafields

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $
-- ============================================================================

View File

@ -14,10 +14,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $
-- ===================================================================
--
-- statut

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $
-- ===================================================================
create table llx_advanced_extrafields

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- ===================================================================
create table llx_advanced_extrafields_options

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- ============================================================================

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $
-- ===================================================================
create table llx_advanced_extrafields_values

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $
-- ===================================================================
ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- ===================================================================
create table llx_bank

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- ============================================================================

View File

@ -14,10 +14,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $
-- =============================================================================
-- courant : type de compte: 0 epargne, 1 courant, 2 caisse

View File

@ -13,10 +13,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $
-- ===================================================================
create table llx_bank_categ

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $
-- ===================================================================
ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);

View File

@ -12,10 +12,9 @@
-- 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, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $
-- ===================================================================
create table llx_bank_class

Some files were not shown because too many files have changed in this diff Show More