cvsimport
This commit is contained in:
Laurent Destailleur
commit
a21c21aced
119
build/aps/APP-META.xml
Executable file
119
build/aps/APP-META.xml
Executable file
@ -0,0 +1,119 @@
|
||||
<!-- Application namespaces and APS version (step 9) -->
|
||||
<application xmlns="http://apstandard.com/ns/1" version="1.2">
|
||||
<!-- Application common properties (step 9) -->
|
||||
<id>http://www.dolibarr.org/</id>
|
||||
<name>Dolibarr</name>
|
||||
<version>__VERSION__</version>
|
||||
<release>__RELEASE__</release>
|
||||
<homepage>http://www.dolibarr.org/</homepage>
|
||||
<vendor>
|
||||
<name>Dolibarr</name>
|
||||
<homepage>http://www.dolibarr.org/</homepage>
|
||||
<icon path="images/icon.png"/>
|
||||
</vendor>
|
||||
<packager>
|
||||
<name>Parallels</name>
|
||||
<homepage>http://parallels.com</homepage>
|
||||
<uri>uuid:714f0a7b-85d6-4eb8-b68e-40f9acbb3103</uri>
|
||||
</packager>
|
||||
<presentation>
|
||||
<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
|
||||
<description>
|
||||
Dolibarr is a free modular software (you see only features you need) to manage small and medium companies, freelancers or foundations.
|
||||
This Opensource software is designed to provide all features you need to manage information on many aspects of your business
|
||||
into an intuitive and user-friendly graphical interface
|
||||
It's an OpenSource software you can install on a web server or as a standalone software. Dolibarr is designed to provide simplicity:
|
||||
* Simple to use (any module can be disabled to removed not required features, only the permissions features can not be disabled).
|
||||
* Simple to install (with DoliWamp the auto-installer for Windows, DoliBuntu, the auto-installer for Ubuntu/Debian or DoliMamp the auto-installer for Mac OS X, for those who do not know how to install an Apache server, MySQL, PHP. A web assistant is available for others, no additional components required, no Java, no Python, no Perl, no PEARL PHP modules, no other exotic library).
|
||||
* Simple for development (no heavy frameworks). Dolibarr, developed in PHP object, incorporates its own natural code, allowing every developer to be immediately operational, with no other knowledge than PHP).
|
||||
</description>
|
||||
<icon path="doc/images/appicon_64.png"/>
|
||||
<screenshot path="doc/images/dolibarr_screenshot1.jpg">
|
||||
<description>Screenshot 1</description>
|
||||
</screenshot>
|
||||
<changelog>
|
||||
<version version="3.1.0" release="0">
|
||||
<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
|
||||
</version>
|
||||
</changelog>
|
||||
<categories>
|
||||
<category>Back office/Customer Relationship Management</category>
|
||||
</categories>
|
||||
<languages>
|
||||
<language>en</language>
|
||||
<language>fr</language>
|
||||
<language>es</language>
|
||||
<language>de</language>
|
||||
<language>pt</language>
|
||||
</languages>
|
||||
</presentation>
|
||||
<upgrade match="/application/version = '3.0'"/>
|
||||
<!-- Application service (step 4) -->
|
||||
<service id="blog">
|
||||
<!-- Service presentation properties (step 7) -->
|
||||
<license must-accept="true">
|
||||
<text>
|
||||
<name>GPLv2</name>
|
||||
<file>COPYING</file>
|
||||
</text>
|
||||
</license>
|
||||
<presentation>
|
||||
<name>Dolibarr instance</name>
|
||||
<entry-points>
|
||||
<entry class="frontpage" dst="/">
|
||||
Application entry point
|
||||
</entry>
|
||||
</entry-points>
|
||||
</presentation>
|
||||
<!-- Service settings (step 7) -->
|
||||
<settings>
|
||||
<group>
|
||||
<name>Administrator's preferences</name>
|
||||
<setting id="admin_name" type="string"
|
||||
default-value="admin" min-length="1"
|
||||
max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
|
||||
<name>Administrator's login</name>
|
||||
<error-message>Please make sure the text you entered
|
||||
starts with a letter and continues with either numbers,
|
||||
letters, underscores or hyphens.</error-message>
|
||||
</setting>
|
||||
<setting id="admin_password"
|
||||
type="password" min-length="1" >
|
||||
<name>Password</name>
|
||||
</setting>
|
||||
</group>
|
||||
</settings>
|
||||
<!-- Service used technologies (step 6) -->
|
||||
<requirements xmlns:php="http://apstandard.com/ns/1/php"
|
||||
xmlns:db="http://apstandard.com/ns/1/db">
|
||||
<php:version min="4.2.0"/>
|
||||
<php:extension>mysql</php:extension>
|
||||
<php:extension>mbstring</php:extension>
|
||||
<php:safe-mode>false</php:safe-mode>
|
||||
<db:db>
|
||||
<db:id>main</db:id>
|
||||
<db:default-name>dolibarr</db:default-name>
|
||||
<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
|
||||
<db:server-type>mysql</db:server-type>
|
||||
<db:server-min-version>4.1.0</db:server-min-version>
|
||||
</db:db>
|
||||
</requirements>
|
||||
<!-- Content delivery settings (step 8) -->
|
||||
<provision>
|
||||
<url-mapping>
|
||||
<default-prefix>dolibarr</default-prefix>
|
||||
<installed-size>35000000</installed-size>
|
||||
<mapping url="/" path="htdocs"
|
||||
xmlns:php="http://apstandard.com/ns/1/php">
|
||||
<php:handler>
|
||||
<php:extension>php</php:extension>
|
||||
</php:handler>
|
||||
</mapping>
|
||||
</url-mapping>
|
||||
<!-- Service configuration script declaration (step 10) -->
|
||||
<configuration-script name="configure">
|
||||
<script-language>php</script-language>
|
||||
</configuration-script>
|
||||
</provision>
|
||||
</service>
|
||||
</application>
|
||||
1
build/aps/configure
vendored
Executable file
1
build/aps/configure
vendored
Executable file
@ -0,0 +1 @@
|
||||
# This script will be invoked when application instance is to be setup
|
||||
@ -2,7 +2,7 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# \file build/makepack-dolibarr.pl
|
||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe)
|
||||
# \version $Id$
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.103 2011/06/24 23:10:52 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -14,14 +14,14 @@ $MINOR="1";
|
||||
$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
|
||||
|
||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
%REQUIREMENTTARGET=( # Tool requirement for each package
|
||||
"SNAPSHOT"=>"tar",
|
||||
"TGZ"=>"tar",
|
||||
"ZIP"=>"7z",
|
||||
"RPM"=>"rpmbuild",
|
||||
"DEB"=>"dpkg",
|
||||
"EXE"=>"makensis.exe",
|
||||
"APS"=>"zip",
|
||||
"EXEDOLIWAMP"=>"iscc.exe"
|
||||
);
|
||||
%ALTERNATEPATH=(
|
||||
@ -35,7 +35,7 @@ $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
|
||||
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
|
||||
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
|
||||
$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
|
||||
$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR.$BUILD";
|
||||
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
|
||||
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
|
||||
if (-d "/usr/src/redhat") {
|
||||
# redhat
|
||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$REVISION='$Revision: 1.103 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="1.0 (build $REVISION)";
|
||||
|
||||
|
||||
@ -460,7 +460,6 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/conf/conf*sav*`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/test`;
|
||||
# To remove once stable
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/incluces/modules/facture/doc/doc_generic_invoice_odt.modules.php`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
|
||||
@ -539,19 +538,81 @@ if ($nboftargetok) {
|
||||
next;
|
||||
}
|
||||
|
||||
if ($target eq 'EXE') {
|
||||
print "Remove target $FILENAMEEXE.exe...\n";
|
||||
unlink "$DESTI/$FILENAMEEXE.exe";
|
||||
if ($target eq 'APS') {
|
||||
print "Remove target $FILENAMEAPS.zip...\n";
|
||||
unlink "$DESTI/$FILENAMEAPS.zip";
|
||||
|
||||
print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
|
||||
$cmd="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
|
||||
print "$cmd\n";
|
||||
$ret=`$cmd`;
|
||||
print "Move $FILENAMEEXE.exe to $DESTI\n";
|
||||
rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
|
||||
next;
|
||||
#rmdir "$BUILDROOT/$PROJECT.tmp";
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
|
||||
print "Create directory $BUILDROOT/$PROJECT.tmp\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
|
||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
|
||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/DoliWamp-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/DoliMamp-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.tar`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.tgz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.zip`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/doxygen/doxygen_warnings.log`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/html`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/dbmodel`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/initdata`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/phpcheckstyle`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/phpunit`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/spec`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/uml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/xdebug`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/flyer`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/font`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/tshirt`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/rollup`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.mysql`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.old`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.postgres`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf*sav*`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/test`;
|
||||
|
||||
print "Create APS files\n";
|
||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/APP-META.xml\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\"";
|
||||
$ret=`$cmd`;
|
||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
|
||||
$ret=`$cmd`;
|
||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
|
||||
|
||||
print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
|
||||
|
||||
print "Go to directory $BUILDROOT/$PROJECT.tmp\n";
|
||||
$olddir=getcwd();
|
||||
chdir("$BUILDROOT\/$PROJECT.tmp");
|
||||
#$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$PROJECT.tmp\/$PROJECT\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEAPS.zip $BUILDROOT/$PROJECT.tmp/$PROJECT\\*";
|
||||
$cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip $PROJECT\\*";
|
||||
print $cmd."\n";
|
||||
$ret= `$cmd`;
|
||||
chdir("$olddir");
|
||||
|
||||
if ($OS =~ /windows/i)
|
||||
{
|
||||
print "Move $FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n";
|
||||
$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "Move $FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n";
|
||||
$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
|
||||
if ($target eq 'EXEDOLIWAMP')
|
||||
{
|
||||
print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
|
||||
|
||||
@ -150,15 +150,6 @@ echo Set permission on $docdir
|
||||
chown -R apache.apache $docdir
|
||||
chmod -R o-w $docdir
|
||||
|
||||
if [ -s /usr/bin/chcon ]; then
|
||||
echo Set SELinux permissions
|
||||
chcon -R -h -t httpd_sys_content_t $targetdir
|
||||
chcon -R -h -t httpd_sys_content_t $docdir
|
||||
chcon -R -h -t httpd_sys_script_rw_t $targetdir
|
||||
chcon -R -h -t httpd_sys_script_rw_t $docdir
|
||||
chcon -R -h -t httpd_sys_script_exec_t $targetdir
|
||||
fi
|
||||
|
||||
# Create empty conf.php file for web installer
|
||||
if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
|
||||
echo Create empty Dolibarr conf.php file
|
||||
@ -167,6 +158,16 @@ if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
|
||||
chmod ug+rw $targetdir/htdocs/conf/conf.php
|
||||
fi
|
||||
|
||||
if [ -s /usr/bin/chcon ]; then
|
||||
echo Set SELinux permissions
|
||||
# Warning: chcon seems not cumulative
|
||||
#chcon -R -h -t httpd_sys_content_t $targetdir
|
||||
#chcon -R -h -t httpd_sys_content_t $docdir
|
||||
chcon -R -h -t httpd_sys_script_rw_t $targetdir
|
||||
chcon -R -h -t httpd_sys_script_rw_t $docdir
|
||||
#chcon -R -h -t httpd_sys_script_exec_t $targetdir
|
||||
fi
|
||||
|
||||
# Restart web server
|
||||
echo Restart web server
|
||||
if [ -f %{_sysconfdir}/init.d/httpd ]; then
|
||||
@ -187,6 +188,11 @@ echo
|
||||
#---- postun (after uninstall)
|
||||
%postun
|
||||
|
||||
# Dolibarr files are stored into /var/www
|
||||
export targetdir='/var/www/dolibarr'
|
||||
# Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents
|
||||
export docdir='/usr/share/dolibarr/documents'
|
||||
|
||||
export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
|
||||
if [ -f $conffile ] ;
|
||||
then
|
||||
@ -205,6 +211,8 @@ then
|
||||
fi
|
||||
|
||||
rm -rf /etc/dolibarr
|
||||
rm -rf $targetdir/htdocs/conf
|
||||
rm -rf $targetdir/htdocs/install
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/admin/company.php
|
||||
* \ingroup company
|
||||
* \brief Setup page to configure company/foundation
|
||||
* \version $Id$
|
||||
* \version $Id: company.php,v 1.92 2011/06/24 19:57:45 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -136,9 +136,10 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["c
|
||||
dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"],'chaine',0,'',$conf->entity);
|
||||
dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"],'chaine',0,'',$conf->entity);
|
||||
dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"],'chaine',0,'',$conf->entity);
|
||||
dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
|
||||
dolibarr_set_const($db, "MAIN_INFO_TRAINER",$_POST["trainer"],'chaine',0,'',$conf->entity);
|
||||
|
||||
dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
|
||||
|
||||
dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity);
|
||||
|
||||
dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"],'chaine',0,'',$conf->entity);
|
||||
@ -471,6 +472,22 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// ProfId5
|
||||
if ($langs->transcountry("ProfId5",$pays_code) != '-')
|
||||
{
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$pays_code).'</td><td>';
|
||||
if ($pays_code)
|
||||
{
|
||||
print '<input name="trainer" size="20" value="' . $conf->global->MAIN_INFO_TRAINER . '">';
|
||||
}
|
||||
else
|
||||
{
|
||||
print $countrynotdefined;
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// TVA Intra
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("VATIntra").'</td><td>';
|
||||
@ -478,12 +495,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
|
||||
print '</td></tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
// Trainer accreditation
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("TrainerId").'</td><td>';
|
||||
print '<input name="trainer" size="20" value="' . $conf->global->MAIN_INFO_TRAINER . '">';
|
||||
print '</td></tr>';
|
||||
|
||||
|
||||
/*
|
||||
@ -794,10 +805,18 @@ else
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// Trainer accreditation
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("TrainerId").'</td><td>' . $conf->global->MAIN_INFO_TRAINER . '</td></tr>';
|
||||
|
||||
// ProfId5
|
||||
if ($langs->transcountry("ProfId5",$pays_code) != '-')
|
||||
{
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$pays_code).'</td><td>';
|
||||
if ($langs->transcountry("ProfId5",$pays_code) != '-')
|
||||
{
|
||||
print $conf->global->MAIN_INFO_TRAINER;
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// TVA
|
||||
$var=!$var;
|
||||
@ -964,6 +983,6 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
llxFooter('$Date: 2011/06/24 19:57:45 $ - $Revision: 1.92 $');
|
||||
|
||||
?>
|
||||
@ -25,7 +25,7 @@
|
||||
* \file htdocs/admin/dict.php
|
||||
* \ingroup setup
|
||||
* \brief Page to administer data tables
|
||||
* \version $Id$
|
||||
* \version $Id: dict.php,v 1.145 2011/06/25 09:50:56 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -123,7 +123,8 @@ $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.civilite AS libelle, c.
|
||||
$tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
|
||||
$tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.deductible, p.code as pays_code, p.libelle as pays, a.fk_pays as pays_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1";
|
||||
$tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent";
|
||||
$tabsql[9] = "SELECT code, code_iso, label as libelle, symbole, active FROM ".MAIN_DB_PREFIX."c_currencies";
|
||||
//$tabsql[9] = "SELECT code, code_iso, label as libelle, symbole, active FROM ".MAIN_DB_PREFIX."c_currencies";
|
||||
$tabsql[9] = "SELECT code, code_iso, label as libelle, active FROM ".MAIN_DB_PREFIX."c_currencies";
|
||||
$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1, t.localtax2, p.libelle as pays, p.code as pays_code, t.fk_pays as pays_id, t.recuperableonly, t.note, t.active FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid";
|
||||
$tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
|
||||
$tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
|
||||
@ -171,7 +172,8 @@ $tabfield[5] = "code,libelle";
|
||||
$tabfield[6] = "code,libelle,type,position";
|
||||
$tabfield[7] = "code,libelle,pays_id,pays,deductible";
|
||||
$tabfield[8] = "code,libelle";
|
||||
$tabfield[9] = "code,code_iso,libelle,symbole";
|
||||
//$tabfield[9] = "code,code_iso,libelle,symbole";
|
||||
$tabfield[9] = "code,code_iso,libelle";
|
||||
$tabfield[10]= "pays_id,pays,taux,recuperableonly,localtax1,localtax2,note";
|
||||
$tabfield[11]= "element,source,code,libelle";
|
||||
$tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
|
||||
@ -195,7 +197,8 @@ $tabfieldvalue[5] = "code,libelle";
|
||||
$tabfieldvalue[6] = "code,libelle,type,position";
|
||||
$tabfieldvalue[7] = "code,libelle,pays,deductible";
|
||||
$tabfieldvalue[8] = "code,libelle";
|
||||
$tabfieldvalue[9] = "code,code_iso,libelle,symbole";
|
||||
//$tabfieldvalue[9] = "code,code_iso,libelle,symbole";
|
||||
$tabfieldvalue[9] = "code,code_iso,libelle";
|
||||
$tabfieldvalue[10]= "pays,taux,recuperableonly,localtax1,localtax2,note";
|
||||
$tabfieldvalue[11]= "element,source,code,libelle";
|
||||
$tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
|
||||
@ -219,7 +222,8 @@ $tabfieldinsert[5] = "code,civilite";
|
||||
$tabfieldinsert[6] = "code,libelle,type,position";
|
||||
$tabfieldinsert[7] = "code,libelle,fk_pays,deductible";
|
||||
$tabfieldinsert[8] = "code,libelle";
|
||||
$tabfieldinsert[9] = "code,code_iso,label,symbole";
|
||||
//$tabfieldinsert[9] = "code,code_iso,label,symbole";
|
||||
$tabfieldinsert[9] = "code,code_iso,label";
|
||||
$tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1,localtax2,note";
|
||||
$tabfieldinsert[11]= "element,source,code,libelle";
|
||||
$tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
|
||||
@ -893,7 +897,7 @@ print '<br>';
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
llxFooter('$Date: 2011/06/25 09:50:56 $ - $Revision: 1.145 $');
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.73 2011/06/25 09:50:56 eldy Exp $
|
||||
--
|
||||
-- Be carefull to requests order.
|
||||
-- This file must be loaded by calling /install/index.php page
|
||||
@ -27,7 +27,7 @@ ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0;
|
||||
ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL ;
|
||||
--ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default '';
|
||||
|
||||
ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255);
|
||||
ALTER TABLE llx_commande MODIFY model_pdf varchar(255);
|
||||
|
||||
@ -93,11 +93,12 @@ ProfId1Short=Prof. id 1
|
||||
ProfId2Short=Prof. id 2
|
||||
ProfId3Short=Prof. id 3
|
||||
ProfId4Short=Prof. id 4
|
||||
ProfId5Short=Prof. id 5
|
||||
ProfId1=ID profesional 1
|
||||
ProfId2=ID profesional 2
|
||||
ProfId3=ID profesional 3
|
||||
ProfId4=ID profesional 4
|
||||
TrainerId=Nº acreditació de formació
|
||||
ProfId5=ID profesional 5
|
||||
ProfId1AR=CUIT/CUIL
|
||||
ProfId2AR=Ingressos bruts
|
||||
ProfId3AR=-
|
||||
|
||||
@ -132,7 +132,7 @@ BecauseConnectionFailedParametersMayBeWrong=La connexió falla, els paràmetres
|
||||
OrphelinsPaymentsDetectedByMethod=Pagaments orfes detectats pel mètode %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Esborreu manualment i premeu F5 per continuar.
|
||||
KeepDefaultValuesWamp=Està utilitzant l'assistent d'instal·lació DoliWamp, els valors proposats aquí estan optimitzats. Canviels només si està segur d'això.
|
||||
KeepDefaultValuesDeb=Està utilitzant l'assistent d'instal·lació Dolibarr d'un paquet d'Ubuntu o Debian, els valors proposats per als paràmetres ja estan optimitzats. Només serà necessària la contrasenya del propietari de la base de dades a crear. Canvie l'altra informació només si està segur d'això.
|
||||
KeepDefaultValuesDeb=Està utilitzant l'assistent d'instal·lació Dolibarr d'un paquet Linux o BSD (Ubuntu, Debian, Fedora...), els valors proposats per als paràmetres ja estan optimitzats. Només serà necessària la contrasenya del propietari de la base de dades a crear. Canvie l'altra informació només si està segur d'això.
|
||||
KeepDefaultValuesMamp=Està utilitzant l'assistent d'instal·lació DoliMamp, els valors proposats aquí estan optimitzats. Canviels només si està segur d'això.
|
||||
KeepDefaultValuesProxmox=Està utilitzant l'assistent d'instal·lació Dolibarr des d'una màquina virtual Proxmox, els valors proposats aquí estan optimitzats. Canviels només si està segur d'això.
|
||||
FieldRenamed=Camp renombrat
|
||||
|
||||
@ -44,12 +44,14 @@ BoxTitleCurrentAccounts=Current account's balances
|
||||
BoxTitleSalesTurnover=Sales turnover
|
||||
BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
|
||||
BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
|
||||
BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
|
||||
BoxMyLastBookmarks=My last %s bookmarks
|
||||
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
|
||||
LastRefreshDate=Last refresh date
|
||||
NoRecordedBookmarks=No bookmarks defined.
|
||||
ClickToAdd=Click here to add.
|
||||
NoRecordedCustomers=No recorded customers
|
||||
NoRecordedContacts=No recorded contacts
|
||||
BoxTitleLastActionsToDo=Last %s actions to do
|
||||
BoxTitleLastContracts=Last %s contracts
|
||||
NoActionsToDo=No actions to do
|
||||
|
||||
@ -131,7 +131,7 @@ BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super
|
||||
OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
|
||||
KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
|
||||
KeepDefaultValuesDeb=You use the Dolibarr setup wizard from an Ubuntu or Debian package, so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
|
||||
KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
|
||||
KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
|
||||
KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
|
||||
FieldRenamed=Field renamed
|
||||
|
||||
@ -93,7 +93,7 @@ ProfId1Short=Prof. id 1
|
||||
ProfId2Short=Prof. id 2
|
||||
ProfId3Short=Prof. id 3
|
||||
ProfId4Short=Prof. id 4
|
||||
TrainerId=Nº acreditación de formación
|
||||
ProfId5Short=Prof. id 5
|
||||
ProfId1AR=CUIT/CUIL
|
||||
ProfId2AR=Ingresos brutos
|
||||
ProfId3AR=-
|
||||
@ -102,6 +102,7 @@ ProfId1=ID profesional 1
|
||||
ProfId2=ID profesional 2
|
||||
ProfId3=ID profesional 3
|
||||
ProfId4=ID profesional 4
|
||||
ProfId5=ID profesional 5
|
||||
ProfId1AU=ABN
|
||||
ProfId2AU=-
|
||||
ProfId3AU=-
|
||||
|
||||
@ -132,7 +132,7 @@ BecauseConnectionFailedParametersMayBeWrong=La conexión falla, los parámetros
|
||||
OrphelinsPaymentsDetectedByMethod=Pagos huérfanos detectados por el método %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Suprimalo manualmente y pulse F5 para continuar.
|
||||
KeepDefaultValuesWamp=Está utilizando el asistente de instalación DoliWamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete de Ubuntu o Debian, los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
|
||||
KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux/BSD (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
|
||||
KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
FieldRenamed=Campo renombrado
|
||||
|
||||
@ -51,6 +51,7 @@ LastRefreshDate=Date dernier rafraichissement
|
||||
NoRecordedBookmarks=Pas de bookmarks personnels.
|
||||
ClickToAdd=Cliquer ici pour ajouter.
|
||||
NoRecordedCustomers=Pas de client enregistré
|
||||
NoRecordedContacts=Pas de contact enregistré
|
||||
BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
|
||||
BoxTitleLastContracts=Les %s derniers contrats
|
||||
NoActionsToDo=Pas d'événements à réaliser
|
||||
|
||||
@ -93,11 +93,12 @@ ProfId1Short=Id prof. 1
|
||||
ProfId2Short=Id prof. 2
|
||||
ProfId3Short=Id prof. 3
|
||||
ProfId4Short=Id prof. 4
|
||||
ProfId5Short=Id prof. 5
|
||||
ProfId1=Id professionnel 1
|
||||
ProfId2=Id professionnel 2
|
||||
ProfId3=Id professionnel 3
|
||||
ProfId4=Id professionnel 4
|
||||
TrainerId=N° d'accréditation formation
|
||||
ProfId5=Id professionnel 5
|
||||
ProfId1AR=Id prof. 1 (CUIT/CUIL)
|
||||
ProfId2AR=Id prof. 2 (Revenu brutes)
|
||||
ProfId3AR=-
|
||||
@ -130,6 +131,7 @@ ProfId1FR=Id prof. 1 (SIREN)
|
||||
ProfId2FR=Id prof. 2 (SIRET)
|
||||
ProfId3FR=Id prof. 3 (NAF, ex APE)
|
||||
ProfId4FR=Id prof. 4 (RCS/RM)
|
||||
ProfId5FR=Id prof. 5
|
||||
ProfId1GB=Id prof. 1 (Registration Number)
|
||||
ProfId2GB=-
|
||||
ProfId3GB=Id prof. 3 (SIC)
|
||||
|
||||
@ -132,7 +132,7 @@ BecauseConnectionFailedParametersMayBeWrong=La connexion ayant échoué, les par
|
||||
OrphelinsPaymentsDetectedByMethod=Paiement orphelins détectés par la méthode %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Supprimez le manuellement et appuyez sur F5 pour continuer.
|
||||
KeepDefaultValuesWamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliWamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifier qu'en connaissance de cause.
|
||||
KeepDefaultValuesDeb=Comme vous utilisez l'assistant d'installation Dolibarr depuis un package Ubuntu ou Debian, les valeurs proposées aux paramètres sont déjà optimisées. Seul le mot de passe du propriétaire de la base de données à créer est à renseigner. Ne modifiez les autres informations qu'en connaissance de cause.
|
||||
KeepDefaultValuesDeb=Comme vous utilisez l'assistant d'installation Dolibarr depuis un package Linux/BSD (Ubuntu, Debian, Fedora, ...), les valeurs proposées aux paramètres sont déjà optimisées. Seul le mot de passe du propriétaire de la base de données à créer est à renseigner. Ne modifiez les autres informations qu'en connaissance de cause.
|
||||
KeepDefaultValuesMamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliMamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
|
||||
KeepDefaultValuesProxmox=Comme vous utilisez l'assistant d'installation Dolibarr depuis une machine virtuelle Proxmox, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
|
||||
FieldRenamed=Champ renommé
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* \file htdocs/projet/class/task.class.php
|
||||
* \ingroup project
|
||||
* \brief This file is a CRUD class file for Task (Create/Read/Update/Delete)
|
||||
* \version $Id$
|
||||
* \version $Id: task.class.php,v 1.11 2011/06/25 10:55:11 eldy Exp $
|
||||
* \remarks Initialy built by build_class_from_table on 2008-09-10 12:41
|
||||
*/
|
||||
|
||||
@ -469,7 +469,7 @@ class Task extends CommonObject
|
||||
|
||||
// List of tasks (does not care about permissions. Filtering will be done later)
|
||||
$sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public,";
|
||||
$sql.= " t.rowid as taskid, t.label, t.fk_task_parent, t.duration_effective, t.progress,";
|
||||
$sql.= " t.rowid as taskid, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress,";
|
||||
$sql.= " t.dateo as date_start, t.datee as date_end";
|
||||
if ($mode == 0)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user