task #10501: Can use point of sale with different bank accounts
This commit is contained in:
Juanjo Menent
parent
936a7ee94f
commit
52b441b5b8
@ -14,6 +14,3 @@ version-phpsane.txt
|
|||||||
makepack-phpsane.conf
|
makepack-phpsane.conf
|
||||||
html
|
html
|
||||||
*.deb
|
*.deb
|
||||||
*.dsc
|
|
||||||
*.tar.gz
|
|
||||||
*.changes
|
|
||||||
|
|||||||
@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
|
|||||||
- Call for a mentor on ML debian-mentors to upload packages
|
- Call for a mentor on ML debian-mentors to upload packages
|
||||||
|
|
||||||
- Once package is uploaded, following URL are available:
|
- Once package is uploaded, following URL are available:
|
||||||
http://packages.qa.debian.org/package.html
|
http://packages.qa.debian.org/package
|
||||||
http://bugs.debian.org/package
|
http://bugs.debian.org/package
|
||||||
|
|||||||
@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
|
|||||||
* New upstream release.
|
* New upstream release.
|
||||||
closes: bug#634783
|
closes: bug#634783
|
||||||
|
|
||||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
|
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 18 Jul 2011 12:00:00 +0100
|
||||||
|
|
||||||
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.
|
# More information into /usr/share/dolibarr/ChangeLog file.
|
||||||
@ -1,48 +0,0 @@
|
|||||||
Package: dolibarr
|
|
||||||
Version: __VERSION__
|
|
||||||
Architecture: all
|
|
||||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
|
||||||
Installed-Size: 61200
|
|
||||||
Depends: debconf, 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
|
|
||||||
Recommends: firefox
|
|
||||||
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
|
|
||||||
Data export and import tools
|
|
||||||
LDAP connectivity
|
|
||||||
PDF exports
|
|
||||||
And a lot of more modules...
|
|
||||||
.
|
|
||||||
You can also add third parties external modules or develop yours.
|
|
||||||
|
|
||||||
@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
|
|||||||
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
|
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
|
||||||
# Command to open an URL
|
# Command to open an URL
|
||||||
# For Fedora: xdg-open
|
# For Fedora: xdg-open
|
||||||
# For Debian/Ubuntu: x-www-browser
|
# For Debian/Ubuntu: xdg-open or x-www-browser
|
||||||
# (exo-open for xfde, gnome-open for gnome, ...)
|
# (exo-open for xfde, gnome-open for gnome, ...)
|
||||||
Exec=x-www-browser http://localhost/dolibarr
|
Exec=xdg-open http://localhost/dolibarr
|
||||||
Icon=dolibarr
|
Icon=dolibarr
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|||||||
@ -4,19 +4,19 @@
|
|||||||
// This file must be present into htdocs/install directory
|
// This file must be present into htdocs/install directory
|
||||||
// during install process to be used.
|
// during install process to be used.
|
||||||
//
|
//
|
||||||
// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
|
// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
|
||||||
//
|
//
|
||||||
|
|
||||||
$force_install_noedit=2;
|
$force_install_noedit=1;
|
||||||
$force_install_message='KeepDefaultValuesDeb';
|
$force_install_message='KeepDefaultValuesDeb';
|
||||||
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||||
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
||||||
$force_install_type='mysqli';
|
$force_install_type='mysqli';
|
||||||
$force_install_dbserver='localhost';
|
$force_install_dbserver='localhost';
|
||||||
$force_install_port='3306';
|
$force_install_port='3306';
|
||||||
$force_install_database='dolibarrdebian';
|
$force_install_database='dolibarr';
|
||||||
$force_install_createdatabase='1';
|
$force_install_createdatabase='1';
|
||||||
$force_install_databaselogin='dolibarrdebian';
|
$force_install_databaselogin='dolibarrmysql';
|
||||||
$force_install_databasepass='';
|
$force_install_databasepass='';
|
||||||
$force_install_createuser='1';
|
$force_install_createuser='1';
|
||||||
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
||||||
|
|||||||
@ -24,31 +24,23 @@ db_version 2.0
|
|||||||
echo Run the dolibarr postinst script
|
echo Run the dolibarr postinst script
|
||||||
|
|
||||||
|
|
||||||
# Define vars
|
|
||||||
docdir='/var/lib/dolibarr/documents'
|
docdir='/var/lib/dolibarr/documents'
|
||||||
#docdir='/usr/share/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"
|
|
||||||
config="/etc/dolibarr/conf.php"
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
|
|
||||||
# Create document directory for uploaded data files
|
# Copy apache.conf file into target directory.
|
||||||
mkdir -p $docdir
|
#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||||
chown -R www-data:www-data $docdir
|
#config="/etc/dolibarr/apache.conf"
|
||||||
chmod -R 775 $docdir
|
|
||||||
chmod -R g+s $docdir
|
|
||||||
|
|
||||||
# Copy apache.conf file into target directory
|
|
||||||
#mkdir -p /etc/dolibarr
|
#mkdir -p /etc/dolibarr
|
||||||
#cp -p $apachefileorig $apacheconfig
|
#cp -p $fileorig $config
|
||||||
|
|
||||||
# Copy install config file (with matching Debian) values into target directory
|
# Edit install.forced.php to match Debian values
|
||||||
|
fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||||
|
config="/usr/share/dolibarr/htdocs/install/install.forced.php"
|
||||||
superuserlogin=''
|
superuserlogin=''
|
||||||
superuserpassword=''
|
superuserpassword=''
|
||||||
if [ -f /etc/mysql/debian.cnf ] ; then
|
if [ -f /etc/mysql/debian.cnf ] ; then
|
||||||
@ -58,24 +50,29 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
echo Mysql superuser found to use is $superuserlogin
|
echo Mysql superuser found to use is $superuserlogin
|
||||||
if [ -z "$superuserlogin" ] ; then
|
if [ -z "$superuserlogin" ] ; then
|
||||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
|
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
|
||||||
else
|
else
|
||||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
|
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
|
||||||
fi
|
fi
|
||||||
chown -R root:www-data $installconfig
|
|
||||||
chmod -R 660 $installconfig
|
# Create document directory for uploaded data files
|
||||||
|
mkdir -p $docdir
|
||||||
|
chown -R www-data:www-data $docdir
|
||||||
|
chmod -R 775 $docdir
|
||||||
|
chmod -R g+s $docdir
|
||||||
|
|
||||||
# Create an empty conf.php with permission to web server
|
# Create an empty conf.php with permission to web server
|
||||||
if [ ! -f $config ]
|
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
|
||||||
then
|
then
|
||||||
echo Create empty file $config
|
echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
touch $config
|
touch /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
chown -R root:www-data $config
|
chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
chmod -R 660 $config
|
chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get the web server type (use db_get for interactive mode).
|
|
||||||
#db_reset "dolibarr/webserver"
|
#db_reset "dolibarr/webserver"
|
||||||
|
|
||||||
|
# Get the web server type (use db_get for interactive mode).
|
||||||
#db_get "dolibarr/webserver" # Read value for webserver.
|
#db_get "dolibarr/webserver" # Read value for webserver.
|
||||||
#webserver="$RET"
|
#webserver="$RET"
|
||||||
|
|
||||||
@ -105,7 +102,7 @@ case "$1" in
|
|||||||
|
|
||||||
# Set permissions to web server
|
# Set permissions to web server
|
||||||
chown -R $webuser:$webgroup /usr/share/dolibarr
|
chown -R $webuser:$webgroup /usr/share/dolibarr
|
||||||
chown -R root:$webgroup $config
|
chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
|
|
||||||
# Add link to config file
|
# Add link to config file
|
||||||
echo Setup web server $server to add dolibarr config file
|
echo Setup web server $server to add dolibarr config file
|
||||||
@ -113,6 +110,26 @@ case "$1" in
|
|||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
#echo "Install menu entry"
|
||||||
|
# This one is for Gnome ubuntu
|
||||||
|
#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
|
||||||
|
#target="/usr/share/applications/"
|
||||||
|
#cp -f $fileorig $target
|
||||||
|
# Not sure this is usefull
|
||||||
|
#if test -x /usr/bin/update-menus; then
|
||||||
|
# echo "update-menus"
|
||||||
|
# update-menus;
|
||||||
|
#fi
|
||||||
|
|
||||||
|
# TODO Create the file to force parameters in Web installer
|
||||||
|
#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
|
||||||
|
#then
|
||||||
|
# perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
|
# perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
|
# perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
|
# perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||||
|
#fi
|
||||||
|
|
||||||
# Restart servers
|
# Restart servers
|
||||||
servers="apache2-ssl apache2 mysql"
|
servers="apache2-ssl apache2 mysql"
|
||||||
# Another way to restart
|
# Another way to restart
|
||||||
|
|||||||
113
build/deb/postrm
113
build/deb/postrm
@ -26,11 +26,6 @@ echo Run the dolibarr postrm script
|
|||||||
|
|
||||||
docdir='/var/lib/dolibarr/documents'
|
docdir='/var/lib/dolibarr/documents'
|
||||||
#docdir='/usr/share/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=""
|
export webserver=""
|
||||||
@ -41,38 +36,13 @@ case $webserver in
|
|||||||
Both) webservers="apache2 apache2-ssl" ;;
|
Both) webservers="apache2 apache2-ssl" ;;
|
||||||
*) webservers="apache2 apache2-ssl" ;;
|
*) webservers="apache2 apache2-ssl" ;;
|
||||||
esac
|
esac
|
||||||
|
export includefile=/etc/dolibarr/apache.conf
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
|
||||||
# Call when we upgrade
|
|
||||||
upgrade)
|
|
||||||
;;
|
|
||||||
|
|
||||||
# Call when we uninstall
|
|
||||||
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"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
|
|
||||||
# Call when we uninstall and purge
|
# Call when we uninstall and purge
|
||||||
purge)
|
purge)
|
||||||
echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
|
echo "postrm purge webservers=$webservers includefile=$includefile"
|
||||||
|
|
||||||
# Ask if we must delete database
|
# Ask if we must delete database
|
||||||
echo "postrm db_input dolibarr/postrm"
|
echo "postrm db_input dolibarr/postrm"
|
||||||
@ -89,8 +59,7 @@ case "$1" in
|
|||||||
echo postrm Mysql database deletion
|
echo postrm Mysql database deletion
|
||||||
# Get database configuration
|
# Get database configuration
|
||||||
dbserver="localhost"
|
dbserver="localhost"
|
||||||
dbuser="dolibarrdebian"
|
dbname="dolibarrmysql"
|
||||||
dbname="dolibarrdebian"
|
|
||||||
#db_get "dolibarr/db/name"
|
#db_get "dolibarr/db/name"
|
||||||
#dbname="$RET"
|
#dbname="$RET"
|
||||||
superuserlogin=''
|
superuserlogin=''
|
||||||
@ -151,31 +120,23 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
||||||
|
|
||||||
# Now run the drop user
|
|
||||||
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
|
|
||||||
echo Database login $dbuser removed
|
|
||||||
else
|
|
||||||
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
|
|
||||||
echo $error
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Now run the drop commands
|
# Now run the drop commands
|
||||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||||
log="${log}Droping database $dbname."
|
log="${log}Droping database $dbname."
|
||||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||||
echo $error
|
echo $error
|
||||||
else
|
else
|
||||||
status=drop
|
status=drop
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
error="Unable to run the drop database script."
|
error="Unable to run the drop database script."
|
||||||
echo $error
|
echo $error
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
status=nothing
|
status=nothing
|
||||||
log="${log}Database $dbname already not exists."
|
log="${log}Database $dbname already not exists."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Remove directory $docdir"
|
echo "Remove directory $docdir"
|
||||||
@ -217,6 +178,18 @@ case "$1" in
|
|||||||
set -e
|
set -e
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Remove file and conf file
|
||||||
|
for dir in /usr/share/dolibarr; do
|
||||||
|
if [ -d $dir ] ; then
|
||||||
|
# We disable blocking errors
|
||||||
|
set +e
|
||||||
|
echo "Remove directory $dir"
|
||||||
|
rm -rf $dir ;
|
||||||
|
# We restore blocking errors
|
||||||
|
set -e
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
||||||
set +e
|
set +e
|
||||||
db_reset "dolibarr/postrm"
|
db_reset "dolibarr/postrm"
|
||||||
@ -225,6 +198,34 @@ case "$1" in
|
|||||||
#db_purge
|
#db_purge
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
# Call when we uninstall
|
||||||
|
remove)
|
||||||
|
echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
|
||||||
|
rm -fr /usr/share/dolibarr/htdocs/install
|
||||||
|
|
||||||
|
echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
|
||||||
|
rm -fr /usr/share/dolibarr/htdocs/conf
|
||||||
|
|
||||||
|
# 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
|
||||||
|
;;
|
||||||
|
|
||||||
|
upgrade)
|
||||||
|
;;
|
||||||
|
|
||||||
failed-upgrade|abort-install|abort-upgrade|disappear)
|
failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
Template: dolibarr/postrm
|
Template: dolibarr/postrm
|
||||||
Type: boolean
|
Type: boolean
|
||||||
Default: true
|
Default: true
|
||||||
Description: Delete database ?
|
_Description: Delete database and uploaded files ?
|
||||||
Answer if you want to removed the Dolibarr MySQL database and all
|
Answer if you want to removed the Dolibarr MySQL database and all other
|
||||||
its datas (datas related to this quetion are the Dolibarr DBMS account
|
datas (datas related to this question are the Dolibarr DBMS account, all
|
||||||
and all Dolibarr tables).
|
Dolibarr tables, and all uploaded files).
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# \file build/makepack-dolibarr.pl
|
# \file build/makepack-dolibarr.pl
|
||||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
||||||
# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
|
# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $
|
||||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ use Cwd;
|
|||||||
$PROJECT="dolibarr";
|
$PROJECT="dolibarr";
|
||||||
$MAJOR="3";
|
$MAJOR="3";
|
||||||
$MINOR="1";
|
$MINOR="1";
|
||||||
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||||
$RPMSUBVERSION="auto"; # auto use value found into BUILD
|
$RPMSUBVERSION="auto"; # auto use value found into BUILD
|
||||||
|
|
||||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
|||||||
|
|
||||||
|
|
||||||
use vars qw/ $REVISION $VERSION /;
|
use vars qw/ $REVISION $VERSION /;
|
||||||
$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||||
$VERSION="1.0 (build $REVISION)";
|
$VERSION="1.0 (build $REVISION)";
|
||||||
|
|
||||||
|
|
||||||
@ -263,7 +263,6 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||||
@ -274,10 +273,6 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
||||||
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
|
|
||||||
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
||||||
@ -296,6 +291,11 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||||
@ -306,7 +306,6 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
|
|
||||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
|
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
|
||||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
|
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
|
||||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
|
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
|
||||||
@ -414,19 +413,14 @@ if ($nboftargetok) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'RPM') { # Linux only
|
if ($target eq 'RPM') { # Linux only
|
||||||
#$ARCH='i386';
|
$ARCH='i386';
|
||||||
$ARCH='noarch';
|
|
||||||
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
|
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
|
||||||
$newbuild = $BUILD;
|
$newbuild = $BUILD;
|
||||||
# For fedora
|
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||||
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
|
$newbuild =~ s/beta/1/gi; # beta
|
||||||
$newbuild =~ s/beta/0.2.beta1/gi; # beta
|
$newbuild =~ s/rc./2/gi; # rc
|
||||||
$newbuild =~ s/rc./0.3.rc1/gi; # rc
|
|
||||||
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||||
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
# now newbuild is 0-0 or 0-3 for example
|
||||||
#$newbuild =~ s/beta/1/gi; # beta
|
|
||||||
#$newbuild =~ s/rc./2/gi; # rc
|
|
||||||
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
|
||||||
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
|
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
|
||||||
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
|
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
|
||||||
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
|
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
|
||||||
@ -444,7 +438,6 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "Remove other files\n";
|
print "Remove other files\n";
|
||||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
|
||||||
@ -482,10 +475,6 @@ if ($nboftargetok) {
|
|||||||
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
|
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
|
||||||
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
|
|
||||||
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
|
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -536,33 +525,20 @@ if ($nboftargetok) {
|
|||||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||||
|
|
||||||
print "Remove other files\n";
|
print "Remove other files\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
|
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
|
||||||
@ -676,25 +652,29 @@ if ($nboftargetok) {
|
|||||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
|
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
|
||||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`;
|
||||||
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
|
||||||
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
|
||||||
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
|
||||||
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
|
||||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
||||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||||
# Add files for dpkg-source
|
# Add files for dpkg-source
|
||||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
$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/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/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
$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/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
|
|
||||||
# Add files also required to build binary package with dpkg-buildpackages
|
# Add files also required to build binary package with dpkg-buildpackages
|
||||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
|
||||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
@ -710,18 +690,12 @@ if ($nboftargetok) {
|
|||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move *_all.deb to $DESTI\n";
|
print "Move *_all.deb to $DESTI\n";
|
||||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
|
||||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
|
||||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Move *_all.deb to $DESTI\n";
|
print "Move *_all.deb to $DESTI\n";
|
||||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
|
||||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
|
||||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -65,7 +65,7 @@ print '<div class="menu_bloc">';
|
|||||||
print '<ul class="menu">';
|
print '<ul class="menu">';
|
||||||
print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
|
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_choix2"><a href=".."><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>';
|
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
|
||||||
print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
|
print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
* \file htdocs/filefunc.inc.php
|
* \file htdocs/filefunc.inc.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief File that include conf.php file and functions.lib.php
|
* \brief File that include conf.php file and functions.lib.php
|
||||||
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
|
* \version $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||||
@ -61,17 +61,8 @@ error_reporting(E_ALL ^ E_NOTICE);
|
|||||||
//error_reporting(E_ALL);
|
//error_reporting(E_ALL);
|
||||||
|
|
||||||
|
|
||||||
$conffiletoshowshort = "conf.php";
|
|
||||||
# Define localization of conf file
|
|
||||||
$conffile = "conf/conf.php";
|
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
|
||||||
# For debian like systems
|
|
||||||
#$conffile = "/etc/dolibarr/conf.php";
|
|
||||||
#$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
||||||
|
|
||||||
|
|
||||||
// Include configuration
|
// Include configuration
|
||||||
$result=@include_once($conffile);
|
$result=@include_once("conf/conf.php");
|
||||||
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
|
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
|
||||||
{
|
{
|
||||||
header("Location: install/index.php");
|
header("Location: install/index.php");
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
-- along with this program; if not, write to the Free Software
|
-- along with this program; if not, write to the Free Software
|
||||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
--
|
--
|
||||||
-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
|
-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
|
||||||
--
|
--
|
||||||
|
|
||||||
--
|
--
|
||||||
@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
|
|||||||
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
||||||
|
|
||||||
-- Regions Chile (id country=67)
|
-- Regions Chile (id country=67)
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||||
|
|
||||||
-- Regions San Salvador (id country=86)
|
-- Regions San Salvador (id country=86)
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
-- along with this program; if not, write to the Free Software
|
-- along with this program; if not, write to the Free Software
|
||||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
--
|
--
|
||||||
-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
|
-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
|
||||||
--
|
--
|
||||||
|
|
||||||
--
|
--
|
||||||
@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
|||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--
|
--
|
||||||
-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $
|
-- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $
|
||||||
--
|
--
|
||||||
-- Be carefull to requests order.
|
-- Be carefull to requests order.
|
||||||
-- This file must be loaded by calling /install/index.php page
|
-- This file must be loaded by calling /install/index.php page
|
||||||
@ -131,9 +131,6 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR
|
|||||||
-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
||||||
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
|
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
|
||||||
|
|
||||||
-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product);
|
|
||||||
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
|
|
||||||
|
|
||||||
ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||||
ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||||
ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
|
ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
|
||||||
@ -483,4 +480,3 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
|
|||||||
ALTER TABLE llx_don ADD phone varchar(24) after email;
|
ALTER TABLE llx_don ADD phone varchar(24) after email;
|
||||||
|
|
||||||
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
|
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
-- ============================================================================
|
-- ============================================================================
|
||||||
-- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
-- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
-- Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
-- Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
-- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
-- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||||
--
|
--
|
||||||
-- This program is free software; you can redistribute it and/or modify
|
-- This program is free software; you can redistribute it and/or modify
|
||||||
@ -17,7 +17,7 @@
|
|||||||
-- along with this program; if not, write to the Free Software
|
-- along with this program; if not, write to the Free Software
|
||||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
--
|
--
|
||||||
-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $
|
-- $Id: llx_product_fournisseur.key.sql,v 1.2 2011/07/29 06:58:52 tiaris Exp $
|
||||||
-- ============================================================================
|
-- ============================================================================
|
||||||
|
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref
|
|||||||
ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity);
|
ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity);
|
||||||
ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity);
|
ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity);
|
||||||
|
|
||||||
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
|
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
|
||||||
|
|||||||
@ -32,6 +32,4 @@ NoVAT=Sense IVA per aquesta venda
|
|||||||
Change=Canvi
|
Change=Canvi
|
||||||
CalTip=Feu clic per veure el calendari
|
CalTip=Feu clic per veure el calendari
|
||||||
CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
|
CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
|
||||||
BankToPay=Compte de cobrament
|
BankToPay=Compte de cobrament
|
||||||
ShowCompany=Veure empresa
|
|
||||||
ShowStock=Veure magatzem
|
|
||||||
@ -32,6 +32,4 @@ NoVAT=No VAT for this sale
|
|||||||
Change=Excess received
|
Change=Excess received
|
||||||
CalTip=Click to view the calendar
|
CalTip=Click to view the calendar
|
||||||
CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
|
CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
|
||||||
BankToPay=Charge Account
|
BankToPay=Charge Account
|
||||||
ShowCompany=Show company
|
|
||||||
ShowStock=Show warehouse
|
|
||||||
@ -32,6 +32,4 @@ NoVAT=Sin IVA en esta venta
|
|||||||
Change=Cambio
|
Change=Cambio
|
||||||
CalTip=Haga clic para ver el calendario
|
CalTip=Haga clic para ver el calendario
|
||||||
CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
|
CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
|
||||||
BankToPay=Cuenta de cobro
|
BankToPay=Cuenta de cobro
|
||||||
ShowCompany=Ver empresa
|
|
||||||
ShowStock=Ver almacén
|
|
||||||
@ -32,6 +32,4 @@ NoVAT=Pas de TVA pour cette vente
|
|||||||
Change=Rendu
|
Change=Rendu
|
||||||
CalTip=Cliquez pour afficher le calendrier
|
CalTip=Cliquez pour afficher le calendrier
|
||||||
CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
|
CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
|
||||||
BankToPay=Compte à créditer
|
BankToPay=Compte à créditer
|
||||||
ShowCompany=Voir société
|
|
||||||
ShowStock=Voir entrepôt
|
|
||||||
@ -25,7 +25,7 @@
|
|||||||
* \file htdocs/product/class/product.class.php
|
* \file htdocs/product/class/product.class.php
|
||||||
* \ingroup produit
|
* \ingroup produit
|
||||||
* \brief Fichier de la classe des produits predefinis
|
* \brief Fichier de la classe des produits predefinis
|
||||||
* \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $
|
* \version $Id: product.class.php,v 1.46 2011/07/29 06:59:36 tiaris Exp $
|
||||||
*/
|
*/
|
||||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||||
|
|
||||||
@ -191,15 +191,14 @@ class Product extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert product into database
|
* Insert product into database
|
||||||
* @param user User making insert
|
* @param user User making insert
|
||||||
* @param notrigger Disable triggers
|
* @return int id of product/service if OK or number of error < 0
|
||||||
* @return int Id of product/service if OK or number of error < 0
|
|
||||||
*/
|
*/
|
||||||
function create($user,$notrigger=0)
|
function create($user)
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf ;
|
||||||
|
|
||||||
$error=0;
|
$this->errno = 0;
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
$this->ref = dol_string_nospecial(trim($this->ref));
|
$this->ref = dol_string_nospecial(trim($this->ref));
|
||||||
@ -251,149 +250,172 @@ class Product extends CommonObject
|
|||||||
$this->error='ErrorWrongParameters';
|
$this->error='ErrorWrongParameters';
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (empty($this->ref))
|
|
||||||
{
|
|
||||||
$this->error='ErrorWrongParameters';
|
|
||||||
return -2;
|
|
||||||
}
|
|
||||||
|
|
||||||
dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG);
|
dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG);
|
||||||
|
|
||||||
|
if ($this->ref)
|
||||||
$this->db->begin();
|
|
||||||
|
|
||||||
$sql = "SELECT count(*) as nb";
|
|
||||||
$sql.= " FROM ".MAIN_DB_PREFIX."product";
|
|
||||||
$sql.= " WHERE ref = '" .$this->ref."'";
|
|
||||||
$sql.= " AND entity = ".$conf->entity;
|
|
||||||
|
|
||||||
$result = $this->db->query($sql);
|
|
||||||
if ($result)
|
|
||||||
{
|
{
|
||||||
$obj = $this->db->fetch_object($result);
|
$this->db->begin();
|
||||||
if ($obj->nb == 0)
|
|
||||||
|
$sql = "SELECT count(*)";
|
||||||
|
$sql.= " FROM ".MAIN_DB_PREFIX."product";
|
||||||
|
$sql.= " WHERE ref = '" .$this->ref."'";
|
||||||
|
$sql.= " AND entity = ".$conf->entity;
|
||||||
|
|
||||||
|
$result = $this->db->query($sql) ;
|
||||||
|
if ($result)
|
||||||
{
|
{
|
||||||
// Produit non deja existant
|
$row = $this->db->fetch_array($result);
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
|
if ($row[0] == 0)
|
||||||
$sql.= "datec";
|
|
||||||
$sql.= ", entity";
|
|
||||||
$sql.= ", ref";
|
|
||||||
$sql.= ", price_min";
|
|
||||||
$sql.= ", price_min_ttc";
|
|
||||||
$sql.= ", label";
|
|
||||||
$sql.= ", fk_user_author";
|
|
||||||
$sql.= ", fk_product_type";
|
|
||||||
$sql.= ", price";
|
|
||||||
$sql.= ", price_ttc";
|
|
||||||
$sql.= ", price_base_type";
|
|
||||||
$sql.= ", tobuy";
|
|
||||||
$sql.= ", tosell";
|
|
||||||
$sql.= ", canvas";
|
|
||||||
$sql.= ", finished";
|
|
||||||
$sql.= ", hidden";
|
|
||||||
$sql.= ") VALUES (";
|
|
||||||
$sql.= $this->db->idate(mktime());
|
|
||||||
$sql.= ", ".$conf->entity;
|
|
||||||
$sql.= ", '".$this->ref."'";
|
|
||||||
$sql.= ", ".price2num($price_min_ht);
|
|
||||||
$sql.= ", ".price2num($price_min_ttc);
|
|
||||||
$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
|
|
||||||
$sql.= ", ".$user->id;
|
|
||||||
$sql.= ", ".$this->type;
|
|
||||||
$sql.= ", ".price2num($price_ht);
|
|
||||||
$sql.= ", ".price2num($price_ttc);
|
|
||||||
$sql.= ", '".$this->price_base_type."'";
|
|
||||||
$sql.= ", ".$this->status;
|
|
||||||
$sql.= ", ".$this->status_buy;
|
|
||||||
$sql.= ", '".$this->canvas."'";
|
|
||||||
$sql.= ", ".$this->finished;
|
|
||||||
$sql.= ", ".$this->hidden;
|
|
||||||
$sql.= ")";
|
|
||||||
|
|
||||||
dol_syslog("Product::Create sql=".$sql);
|
|
||||||
$result = $this->db->query($sql);
|
|
||||||
if ( $result )
|
|
||||||
{
|
{
|
||||||
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
|
// Produit non deja existant
|
||||||
|
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
|
||||||
|
$sql.= "datec";
|
||||||
|
$sql.= ", entity";
|
||||||
|
$sql.= ", ref";
|
||||||
|
$sql.= ", price_min";
|
||||||
|
$sql.= ", price_min_ttc";
|
||||||
|
$sql.= ", label";
|
||||||
|
$sql.= ", fk_user_author";
|
||||||
|
$sql.= ", fk_product_type";
|
||||||
|
$sql.= ", price";
|
||||||
|
$sql.= ", price_ttc";
|
||||||
|
$sql.= ", price_base_type";
|
||||||
|
$sql.= ", canvas";
|
||||||
|
$sql.= ", finished";
|
||||||
|
$sql.= ", hidden";
|
||||||
|
$sql.= ") VALUES (";
|
||||||
|
$sql.= $this->db->idate(mktime());
|
||||||
|
$sql.= ", ".$conf->entity;
|
||||||
|
$sql.= ", '".$this->ref."'";
|
||||||
|
$sql.= ", ".price2num($price_min_ht);
|
||||||
|
$sql.= ", ".price2num($price_min_ttc);
|
||||||
|
$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
|
||||||
|
$sql.= ", ".$user->id;
|
||||||
|
$sql.= ", ".$this->type;
|
||||||
|
$sql.= ", ".price2num($price_ht);
|
||||||
|
$sql.= ", ".price2num($price_ttc);
|
||||||
|
$sql.= ", '".$this->price_base_type."'";
|
||||||
|
$sql.= ", '".$this->canvas."'";
|
||||||
|
$sql.= ", ".$this->finished;
|
||||||
|
$sql.= ", ".$this->hidden;
|
||||||
|
$sql.= ")";
|
||||||
|
|
||||||
if ($id > 0)
|
dol_syslog("Product::Create sql=".$sql);
|
||||||
|
$result = $this->db->query($sql);
|
||||||
|
if ( $result )
|
||||||
{
|
{
|
||||||
$this->id = $id;
|
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
|
||||||
$this->price = $price_ht;
|
|
||||||
$this->price_ttc = $price_ttc;
|
|
||||||
$this->price_min = $price_min_ht;
|
|
||||||
$this->price_min_ttc = $price_min_ttc;
|
|
||||||
|
|
||||||
$result = $this->_log_price($user);
|
if ($id > 0)
|
||||||
if ($result > 0)
|
|
||||||
{
|
{
|
||||||
if ( $this->update($id, $user) > 0)
|
$this->id = $id;
|
||||||
|
$this->price = $price_ht;
|
||||||
|
$this->price_ttc = $price_ttc;
|
||||||
|
$this->price_min = $price_min_ht;
|
||||||
|
$this->price_min_ttc = $price_min_ttc;
|
||||||
|
|
||||||
|
$result = $this->_log_price($user);
|
||||||
|
if ($result > 0)
|
||||||
{
|
{
|
||||||
if ($this->catid > 0)
|
if ( $this->update($id, $user) > 0)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
|
if ($this->catid > 0)
|
||||||
$cat = new Categorie($this->db, $this->catid);
|
{
|
||||||
$cat->add_type($this,"product");
|
require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
|
||||||
|
$cat = new Categorie($this->db, $this->catid);
|
||||||
|
$cat->add_type($this,"product");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->_setErrNo("Create",260,$this->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error++;
|
$this->error=$this->db->error();
|
||||||
$this->error='ErrorFailedToUpdateRecord';
|
$this->_setErrNo("Create",264,$this->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error++;
|
$this->_setErrNo("Create",259);
|
||||||
$this->error=$this->db->lasterror();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error++;
|
$this->error=$this->db->error();
|
||||||
$this->error='ErrorFailedToGetInsertedId';
|
$this->_setErrNo("Create",258,$this->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error++;
|
// Le produit existe deja
|
||||||
$this->error=$this->db->lasterror();
|
$this->error='ErrorProductAlreadyExists';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Product already exists with this ref
|
$this->_setErrNo("Create",263);
|
||||||
$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* END COMMIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
if ($this->errno === 0)
|
||||||
|
{
|
||||||
|
// Appel des triggers
|
||||||
|
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
|
||||||
|
$interface=new Interfaces($this->db);
|
||||||
|
$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
|
||||||
|
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
||||||
|
// Fin appel triggers
|
||||||
|
|
||||||
|
$this->db->commit();
|
||||||
|
return $id;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->db->rollback();
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error++;
|
$this->_setErrNo("Create",262);
|
||||||
$this->error=$this->db->lasterror();
|
|
||||||
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $error && ! $notrigger)
|
return -1;
|
||||||
{
|
|
||||||
// Appel des triggers
|
|
||||||
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
|
|
||||||
$interface=new Interfaces($this->db);
|
|
||||||
$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
|
|
||||||
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
|
||||||
// Fin appel triggers
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $error)
|
|
||||||
{
|
|
||||||
$this->db->commit();
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$this->db->rollback();
|
|
||||||
return -$error;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Positionne le numero d'erreur
|
||||||
|
* @param func Nom de la fonction
|
||||||
|
* @param num Numero de l'erreur
|
||||||
|
* @param error string
|
||||||
|
*/
|
||||||
|
function _setErrNo($func, $num, $error='')
|
||||||
|
{
|
||||||
|
$this->errno = $num;
|
||||||
|
dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retourne le texte de l'erreur
|
||||||
|
*/
|
||||||
|
function error()
|
||||||
|
{
|
||||||
|
$errs[257] = "ErrorProductAlreadyExists";
|
||||||
|
$errs[262] = "ErrorProductBadRefOrLabel";
|
||||||
|
|
||||||
|
return $errs[$this->errno];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update a record into database
|
* Update a record into database
|
||||||
* @param id Id of product
|
* @param id Id of product
|
||||||
@ -2139,7 +2161,7 @@ class Product extends CommonObject
|
|||||||
$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild;
|
$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $prods;
|
return $prods;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user