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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Maxime Kohlhaas 2013-11-29 12:04:05 +01:00
commit f6aa04d5ef
109 changed files with 1535 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,7 +6,7 @@
notifications:
email:
on_success: never # [always|never|change] default: change
on_failure: always # [always|never|change] default: always
on_failure: change # [always|never|change] default: always
services:
- memcached # will start memcached

10
ChangeLog
View File

@ -2,6 +2,12 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 3.6 compared to 3.5.* *****
For users:
- New: Add list of orders products in tab "consumption" on thirdparties.
- New: Add graph stats for suppliers orders in tab "stats" on products.
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
- New: Add hidden option BANK_DISABLE_DIRECT_INPUT.
@ -136,7 +142,9 @@ Fix: Bad rounding on margin calculations and display.
Fix: Option drop table into backup was broken.
Fix: [ bug #1105 ] Searching Boxes other search option
Fix: wrong buy price update
Fix :[ bug #1142 ] Set paiement on invoice (PGSql)
Fix: [ bug #1142 ] Set paiement on invoice (PGSql)
Fix: [ bug #1145 ] Agenda button list type do not display
Fix: [ bug #1148 ] Product consomation : supplier order bad status
***** ChangeLog for 3.4.1 compared to 3.4.0 *****
Fix: Display buying price on line edit when no supplier price is defined

33
build/debian/README.howto
View File

@ -155,8 +155,9 @@ from origin/upstream and origin/pristine.
Note: If there was errors solved manually, you may need to make a git commit
* Add an entry into debian/changelog
> dch -v x.y.z-1 "My comment" will add entry.
For example: dch -v x.y.z-1 "New upstream release." for a new version
> dch -v x.y.z-dsfg-1 "My comment" will add entry.
For example: dch -v x.y.z-dsfg-1 "New upstream release." for a new version
Then modify changelog to replace "unstable" with "UNRELEASED".
Warning: Date must have format reported by "date -R"
Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
@ -165,13 +166,17 @@ Warning: Name and email must match value into debian/control file (Entry added h
> rm -fr ../build-area
> git-buildpackage -us -uc
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
* If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git-buildpackage --git-tag-only --git-retag
> git push --all ou git push origin --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag
> git push --tags
* Compilation is then done by a debian developer and sent
@ -187,7 +192,17 @@ http://packages.qa.debian.org/t/tcpdf.html
##### Update but tracker system
To set status of a bug to pending
> bts tag 728235 +pending
> bts tag 999999 +pending
or replay to email 999999@bugs.debian.org + submitter of bug
With a message starting with:
Control: tag -1 +pending
and then a text like:
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
With only message
tag 729538 +pending
@ -227,15 +242,19 @@ Warning: Name and email must match value into debian/control file (Entry added h
> rm -fr ../build-area
> git-buildpackage -us -uc
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
* Test package (see dedicated chapter to test it with debian unstable env)
* If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git-buildpackage --git-tag-only --git-retag
> git push --all ou git push origin --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag
> git push --tags
* Compilation is then done by a debian developer and sent

7
build/debian/changelog
View File

@ -1,3 +1,10 @@
dolibarr (3.6.0-1) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 22 Apr 2013 12:00:00 +0100
dolibarr (3.5.0-1) unstable; urgency=low
[ Laurent Destailleur (eldy) ]

2
build/debian/control
View File

@ -34,7 +34,7 @@ Description: Web based software to manage a small company or foundation
hosting provider to use it from anywhere with any web browser.
.
Dolibarr was designed to be easy to use. Only features you need are
visible, depending on which module were activated.
visible, depending on which modules were activated.
Most common used modules are:
.
Customers, Suppliers or Prospects directory,

2
build/doxygen/dolibarr-doxygen.doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = 3.5.0
PROJECT_NUMBER = 3.6.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

4
build/exe/doliwamp/doliwamp.iss
View File

@ -17,9 +17,9 @@
; ----- Change this -----
AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
AppVerName=DoliWamp-3.5.0-beta
AppVerName=DoliWamp-3.6.0-beta
; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
OutputBaseFilename=DoliWamp-3.5.0-beta
OutputBaseFilename=DoliWamp-3.6.0-beta
; Define full path from wich all relative path are defined
; You must modify this to put here your dolibarr root directory
;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx

7
build/makepack-dolibarr.pl
View File

@ -17,8 +17,8 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="5";
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$MINOR="6";
$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_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
@ -495,11 +495,12 @@ if ($nboftargetok) {
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
$newbuild =~ s/beta/0.2.beta1/gi; # beta
$newbuild =~ s/rc./0.3.rc1/gi; # rc
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
if ($newbuild !~ /-/) { $newbuild.='-0.3'; } # finale
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
#$newbuild =~ s/beta/1/gi; # beta
#$newbuild =~ s/rc./2/gi; # rc
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
#print "newbuild=".$newbuild."\n";exit;
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";

2
build/perl/virtualmin/dolibarr.pl
View File

@ -30,7 +30,7 @@ return "Regis Houssin";
# script_dolibarr_versions()
sub script_dolibarr_versions
{
return ( "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
return ( "3.6.0", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
}
sub script_dolibarr_category

92
build/rpm/dolibarr_fedora.spec
View File

@ -117,9 +117,9 @@ do
lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`;
echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
if [ "$lang1" = "$lang2" ] ; then
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
else
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
fi
done >>%{name}.lang
@ -238,20 +238,20 @@ echo Create document directory $docdir
export config=%{_sysconfdir}/dolibarr/conf.php
if [ -s $config ] && grep -q "File generated by" $config
then
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
fi
# Create config for SE Linux
@ -264,13 +264,13 @@ restorecon -R -v /var/lib/dolibarr
# Create a config link dolibarr.conf
if [ ! -L $apachelink ]; then
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
fi
echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@ -302,33 +302,33 @@ echo
if [ "x$1" = "x0" ] ;
then
# Remove
echo "Removed package"
# Remove
echo "Removed package"
# Define vars
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
/sbin/service httpd restart
fi
# Define vars
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
/sbin/service httpd restart
fi
else
# Upgrade
echo "No remove action done (this is an upgrade)"
# Upgrade
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.12.b
- Initial version (#723326)

242
build/rpm/dolibarr_generic.spec
View File

@ -190,9 +190,9 @@ do
lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`;
echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
if [ "$lang1" = "$lang2" ] ; then
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
else
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
fi
done >>%{name}.lang
@ -323,28 +323,28 @@ export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
# Detect OS
os='unknown';
if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora-redhat';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
export apacheuser='apache';
export apachegroup='apache';
export os='fedora-redhat';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
export apacheuser='apache';
export apachegroup='apache';
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='wwwrun';
export apachegroup='www';
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='wwwrun';
export apachegroup='www';
fi
if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
export apacheuser='apache';
export apachegroup='apache';
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
export apacheuser='apache';
export apachegroup='apache';
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='www-data';
export apachegroup='www-data';
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='www-data';
export apachegroup='www-data';
fi
echo OS detected: $os
%endif
@ -363,16 +363,16 @@ echo Create document directory $docdir
# Create install.forced.php into Dolibarr install directory
if [ "x$os" = "xubuntu-debian" ]
then
superuserlogin=''
superuserpassword=''
if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
# Load superuser login and pass
superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
fi
echo Mysql superuser found to use is $superuserlogin
%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
%{__chmod} -R 660 $installconfig
superuserlogin=''
superuserpassword=''
if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
# Load superuser login and pass
superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
fi
echo Mysql superuser found to use is $superuserlogin
%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
%{__chmod} -R 660 $installconfig
fi
%endif
@ -383,29 +383,29 @@ fi
export config=%{_sysconfdir}/dolibarr/conf.php
if [ -s $config ] && grep -q "File generated by" $config
then
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
%else
%if 0%{?mdkversion}
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
%else
%if 0%{?suse_version}
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
%else
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
%endif
%endif
%endif
@ -418,12 +418,12 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
%endif
%if 0%{?mdkversion} || 0%{?suse_version}
%else
echo Add SE Linux permissions for dolibarr
# semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
restorecon -R -v /etc/dolibarr
restorecon -R -v /var/lib/dolibarr
echo Add SE Linux permissions for dolibarr
# semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
restorecon -R -v /etc/dolibarr
restorecon -R -v /var/lib/dolibarr
%endif
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
%else
@ -432,13 +432,13 @@ fi
# Create a config link dolibarr.conf
if [ ! -L $apachelink ]; then
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
fi
echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@ -451,30 +451,30 @@ echo Restart web server
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
%{_sysconfdir}/init.d/apache2 restart
fi
%endif
# Restart mysql server
echo Restart mysql server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service mysqld restart
/sbin/service mysqld restart
%else
%if 0%{?suse_version}
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
/etc/init.d/mysqld restart
else
/sbin/service mysql restart
/sbin/service mysql restart
fi
%else
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
/etc/init.d/mysqld restart
fi
if [ -f /etc/init.d/mysql ]; then
/etc/init.d/mysql restart
/etc/init.d/mysql restart
fi
%endif
%endif
@ -497,66 +497,66 @@ echo
if [ "x$1" = "x0" ] ;
then
# Remove
echo "Removed package"
# Remove
echo "Removed package"
# Define vars
os='unknown';
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
%else
%if 0%{?suse_version}
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
%else
if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora-redhat';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
%endif
%endif
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
%endif
fi
# Define vars
os='unknown';
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
%else
%if 0%{?suse_version}
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
%else
if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora-redhat';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
%endif
%endif
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
%endif
fi
else
# Upgrade
echo "No remove action done (this is an upgrade)"
# Upgrade
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
- Initial version (#723326)

110
build/rpm/dolibarr_mandriva.spec
View File

@ -114,9 +114,9 @@ do
lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`;
echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
if [ "$lang1" = "$lang2" ] ; then
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
else
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
fi
done >>%{name}.lang
@ -235,31 +235,31 @@ echo Create document directory $docdir
export config=%{_sysconfdir}/dolibarr/conf.php
if [ -s $config ] && grep -q "File generated by" $config
then
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
fi
# Create a config link dolibarr.conf
if [ ! -L $apachelink ]; then
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
fi
echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@ -269,19 +269,19 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
%{_sysconfdir}/init.d/apache2 restart
fi
# Restart mysql
echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
/etc/init.d/mysqld restart
fi
if [ -f /etc/init.d/mysql ]; then
/etc/init.d/mysql restart
/etc/init.d/mysql restart
fi
# Show result
@ -301,39 +301,39 @@ echo
if [ "x$1" = "x0" ] ;
then
# Remove
echo "Removed package"
# Remove
echo "Removed package"
# Define vars
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
# Define vars
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
else
# Upgrade
echo "No remove action done (this is an upgrade)"
# Upgrade
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
- Initial version (#723326)

112
build/rpm/dolibarr_opensuse.spec
View File

@ -115,9 +115,9 @@ do
lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`;
echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
if [ "$lang1" = "$lang2" ] ; then
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
else
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
fi
done >>%{name}.lang
@ -246,31 +246,31 @@ echo Create document directory $docdir
export config=%{_sysconfdir}/dolibarr/conf.php
if [ -s $config ] && grep -q "File generated by" $config
then
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
# File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
fi
# Create a config link dolibarr.conf
if [ ! -L $apachelink ]; then
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
apachelinkdir=`dirname $apachelink`
if [ -d $apachelinkdir ]; then
echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
else
echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
fi
fi
echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@ -280,18 +280,18 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
%{_sysconfdir}/init.d/apache2 restart
fi
# Restart mysql
echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
/etc/init.d/mysqld restart
else
/sbin/service mysql restart
/sbin/service mysql restart
fi
# Show result
@ -311,39 +311,39 @@ echo
if [ "x$1" = "x0" ] ;
then
# Remove
echo "Removed package"
# Define vars
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
# Remove
echo "Removed package"
# Define vars
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
else
# Upgrade
echo "No remove action done (this is an upgrade)"
# Upgrade
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
- Initial version (#723326)

26
dev/fixnotabfiles.sh Executable file
View File

@ -0,0 +1,26 @@
#!/bin/sh
#------------------------------------------------------
# Script to find files that are not Unix encoded
#
# Laurent Destailleur - eldy@users.sourceforge.net
#------------------------------------------------------
# Usage: fixnotabfiles.sh [list|fix]
#------------------------------------------------------
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "Usage: fixnotabfiles.sh [list|fix]"
fi
# To detec
if [ "x$1" = "xlist" ]
then
find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
fi
# To convert
if [ "x$1" = "xfix" ]
then
echo Feature not implemented. Please fix files manually.
fi

2
dev/translation/txpull.sh
View File

@ -20,7 +20,7 @@ fi
if [ "x$1" = "xall" ]
then
for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR vi_VN zh_CN zh_TW
for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR lv_LV nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR uz_UZ vi_VN zh_CN zh_TW
do
echo "tx pull -l $fic $2 $3"
tx pull -l $fic $2 $3

2
dev/translation/txpush.sh
View File

@ -20,7 +20,7 @@ fi
if [ "x$1" = "xall" ]
then
for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR vi_VN zh_CN zh_TW
for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR lv_LV nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR uz_UZ vi_VN zh_CN zh_TW
do
echo "tx push --skip -t -l $fic $2 $3"
tx push --skip -t -l $fic $2 $3

2
htdocs/adherents/class/adherent.class.php
View File

@ -1344,7 +1344,7 @@ class Adherent extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
$sql.= " statut = 1";
$sql.= ", datevalid = ".$this->db->idate($now);
$sql.= ", datevalid = '".$this->db->idate($now)."'";
$sql.= ", fk_user_valid=".$user->id;
$sql.= " WHERE rowid = ".$this->id;

32
htdocs/adherents/fiche.php
View File

@ -321,6 +321,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
if ($result >= 0 && ! count($object->errors))
{
// Logo/Photo save
$dir= $conf->adherent->dir_output . '/' . get_exdir($object->id,2,0,1).'/photos';
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
if ($file_OK)
@ -361,8 +362,21 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
$errmsgs[] = "ErrorBadImageFormat";
}
}
else
{
switch($_FILES['photo']['error'])
{
case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
$errors[] = "ErrorFileSizeTooLarge";
break;
case 3: //uploaded file was only partially uploaded
$errors[] = "ErrorFilePartiallyUploaded";
break;
}
}
$rowid=$object->id;
$rowid=$object->id;
$action='';
if (! empty($backtopage))
@ -848,11 +862,11 @@ else
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
// Skype
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
}
// Birthday
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
$form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
@ -1090,10 +1104,11 @@ else
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td></tr>';
// Skype
if (! empty($conf->skype->enabled)) {
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
}
// Birthday
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
@ -1413,8 +1428,11 @@ else
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td class="valeur">'.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
// Skype
print '<tr><td>'.$langs->trans("Skype").'</td><td class="valeur">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td class="valeur">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
}
// Birthday
print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';

25
htdocs/admin/agenda_xcal.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2008-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
*
@ -48,8 +48,9 @@ if ($actionsave)
$i+=dolibarr_set_const($db,'MAIN_AGENDA_XCAL_EXPORTKEY',trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha')),'chaine',0,'',$conf->entity);
$i+=dolibarr_set_const($db,'MAIN_AGENDA_EXPORT_PAST_DELAY',trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha')),'chaine',0,'',$conf->entity);
$i+=dolibarr_set_const($db,'MAIN_AGENDA_EXPORT_CACHE',trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha')),'chaine',0,'',$conf->entity);
if ($i >= 3)
$i+=dolibarr_set_const($db,'AGENDA_EXPORT_FIX_TZ',trim(GETPOST('AGENDA_EXPORT_FIX_TZ','alpha')),'chaine',0,'',$conf->entity);
if ($i >= 4)
{
$db->commit();
setEventMessage($langs->trans("SetupSaved"));
@ -117,6 +118,24 @@ print "</tr>";
print '</table>';
print '<br>';
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print '<td width="25%">'.$langs->trans("Parameter")."</td>";
print "<td>".$langs->trans("Value")."</td>";
print "</tr>";
print "<tr ".$bc[$var].">";
print '<td class="fieldrequired">'.$langs->trans("FixTZ")."</td>";
print "<td>";
print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.$conf->global->AGENDA_EXPORT_FIX_TZ.'">';
print ' &nbsp; '.$langs->trans("FillThisOnlyIfRequired");
print "</td>";
print "</tr>";
print '</table>';
print '<br><center>';
print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
print "</center>";

11
htdocs/admin/company.php
View File

@ -561,9 +561,9 @@ if ($action == 'edit' || $action == 'updateedit')
print '<td align="right">&nbsp;</td>';
print "</tr>\n";
$var=true;
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax1\" value=\"localtax1on\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION != "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
@ -595,7 +595,8 @@ if ($action == 'edit' || $action == 'updateedit')
$var=true;
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax2\" value=\"localtax2on\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION != "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
@ -941,7 +942,7 @@ else
$var=true;
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" disabled value=\"localtax1on\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION != "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
@ -974,7 +975,7 @@ else
$var=true;
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" disabled value=\"localtax2on\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION != "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";

79
htdocs/categories/categorie.php
View File

@ -118,7 +118,8 @@ if (empty($reshook))
}
if ($type==1 && $user->rights->societe->creer)
{
$object = new Societe($db);
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
$object = new Fournisseur($db);
$result = $object->fetch($objectid);
$elementtype = 'fournisseur';
}
@ -152,7 +153,7 @@ if (empty($reshook))
setEventMessage($cat->errors,'errors');
}
}
// Add object into a category
if ($parent > 0)
{
@ -165,7 +166,8 @@ if (empty($reshook))
}
if ($type==1 && $user->rights->societe->creer)
{
$object = new Societe($db);
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
$object = new Fournisseur($db);
$result = $object->fetch($objectid);
$elementtype = 'fournisseur';
}
@ -319,11 +321,11 @@ if ($socid)
dol_fiche_end();
if ($soc->client) formCategory($db,$soc,2,$socid);
if ($soc->client) formCategory($db,$soc,2,$socid,$user->rights->societe->creer);
if ($soc->client && $soc->fournisseur) print '<br><br>';
if ($soc->fournisseur) formCategory($db,$soc,1,$socid);
if ($soc->fournisseur) formCategory($db,$soc,1,$socid,$user->rights->societe->creer);
}
else if ($id || $ref)
{
@ -377,7 +379,7 @@ else if ($id || $ref)
dol_fiche_end();
formCategory($db,$product,0);
formCategory($db,$product,0,($user->rights->produit->creer || $user->rights->service->creer));
}
if ($type == 3)
@ -456,7 +458,7 @@ else if ($id || $ref)
dol_fiche_end();
formCategory($db,$member,3);
formCategory($db,$member,3,0,$user->rights->adherent->creer);
}
if ($type == 4)
{
@ -602,7 +604,7 @@ else if ($id || $ref)
dol_fiche_end();
formCategory($db,$object,4);
formCategory($db,$object,4,$user->rights->societe->creer);
}
}
@ -610,13 +612,14 @@ else if ($id || $ref)
/**
* Function to output a form to add object into a category
*
* @param DoliDb $db Database handler
* @param Object $object Object we want to see categories it can be classified into
* @param int $typeid Type of category (0, 1, 2, 3)
* @param int $socid Id thirdparty
* @param DoliDb $db Database handler
* @param Object $object Object we want to see categories it can be classified into
* @param int $typeid Type of category (0, 1, 2, 3)
* @param int $socid Id thirdparty
* @param string $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify'
* @return int 0
*/
function formCategory($db,$object,$typeid,$socid=0)
function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
{
global $user,$langs,$form,$bc;
@ -626,33 +629,37 @@ function formCategory($db,$object,$typeid,$socid=0)
if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort");
if ($typeid == 4) $title = $langs->trans("ContactCategoriesShort");
// Form to add record into a category
print '<br>';
print_fiche_titre($title,'','');
print '<form method="post" action="'.DOL_URL_ROOT.'/categories/categorie.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="typeid" value="'.$typeid.'">';
print '<input type="hidden" name="type" value="'.$typeid.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="40%">';
print $langs->trans("ClassifyInCategory").' &nbsp;';
print $form->select_all_categories($typeid,'auto');
print '</td><td>';
print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
if ($user->rights->categorie->creer)
// Form to add record into a category
if ($showclassifyform)
{
print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/categories/fiche.php?action=create&amp;origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">';
print $langs->trans("CreateCat").' ';
print img_picto($langs->trans("Create"),'filenew');
print "</a>";
print '</td>';
print '<form method="post" action="'.DOL_URL_ROOT.'/categories/categorie.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="typeid" value="'.$typeid.'">';
print '<input type="hidden" name="type" value="'.$typeid.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="40%">';
print $langs->trans("ClassifyInCategory").' &nbsp;';
print $form->select_all_categories($typeid,'auto');
print '</td><td>';
print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
if ($user->rights->categorie->creer)
{
print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/categories/fiche.php?action=create&amp;origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">';
print $langs->trans("CreateCat").' ';
print img_picto($langs->trans("Create"),'filenew');
print "</a>";
print '</td>';
}
print '</tr>';
print '</table>';
print '</form>';
print '<br>';
}
print '</tr>';
print '</table>';
print '</form>';
print '<br/>';
$c = new Categorie($db);

20
htdocs/categories/class/categorie.class.php
View File

@ -386,7 +386,7 @@ class Categorie
* Link an object to the category
*
* @param Object $obj Object to link to category
* @param string $type Type of category (member, supplier, product, customer, contact)
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
* @return int 1 : OK, -1 : erreur SQL, -2 : id not defined, -3 : Already linked
*/
function add_type($obj,$type)
@ -397,11 +397,14 @@ class Categorie
if ($this->id == -1) return -2;
if ($type == 'company') $type='societe';
if ($type == 'fournisseur') $type='societe';
// For backward compatibility
if ($type == 'company') $type='societe';
if ($type == 'customer') $type='societe';
if ($type == 'supplier') $type='fournisseur';
$column_name=$type;
if ($type=='contact') $column_name='socpeople';
if ($type=='fournisseur') $column_name='societe';
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".$column_name.")";
$sql .= " VALUES (".$this->id.", ".$obj->id.")";
@ -479,7 +482,7 @@ class Categorie
* Delete object from category
*
* @param Object $obj Object
* @param string $type Type
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
* @return int 1 if OK, -1 if KO
*/
function del_type($obj,$type)
@ -488,12 +491,15 @@ class Categorie
$error=0;
if ($type == 'company') $type='societe';
if ($type == 'fournisseur') $type='societe';
// For backward compatibility
if ($type == 'company') $type='societe';
if ($type == 'customer') $type='societe';
if ($type == 'supplier') $type='fournisseur';
$column_name=$type;
if ($type=='contact') $column_name='socpeople';
if ($type=='fournisseur') $column_name='societe';
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".$type;
$sql .= " WHERE fk_categorie = ".$this->id;
$sql .= " AND fk_".$column_name." = ".$obj->id;

18
htdocs/comm/action/class/actioncomm.class.php
View File

@ -824,7 +824,8 @@ class ActionComm extends CommonObject
require_once (DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php");
require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php");
require_once (DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php");
dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
// Check parameters
@ -887,7 +888,7 @@ class ActionComm extends CommonObject
$sql.= " AND a.entity = ".$conf->entity;
foreach ($filters as $key => $value)
{
if ($key == 'notolderthan') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'";
if ($key == 'notolderthan' && $value != '') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'";
if ($key == 'year') $sql.=" AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value,1))."' AND '".$this->db->idate(dol_get_last_day($value,12))."'";
if ($key == 'id') $sql.=" AND a.id=".(is_numeric($value)?$value:0);
if ($key == 'idfrom') $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
@ -943,8 +944,8 @@ class ActionComm extends CommonObject
$event=array();
$event['uid']='dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
$event['type']=$type;
$datestart=$this->db->jdate($obj->datep);
$dateend=$this->db->jdate($obj->datep2);
$datestart=$this->db->jdate($obj->datep)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
$dateend=$this->db->jdate($obj->datep2)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
$duration=$obj->durationp;
$event['summary']=$obj->label.($obj->socname?" (".$obj->socname.")":"");
$event['desc']=$obj->note;
@ -963,8 +964,8 @@ class ActionComm extends CommonObject
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
$url=$urlwithroot.'/comm/action/fiche.php?id='.$obj->id;
$event['url']=$url;
$event['created']=$this->db->jdate($obj->datec);
$event['modified']=$this->db->jdate($obj->datem);
$event['created']=$this->db->jdate($obj->datec)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
$event['modified']=$this->db->jdate($obj->datem)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
if ($qualified && $datestart)
{
@ -1011,10 +1012,11 @@ class ActionComm extends CommonObject
if ($result >= 0)
{
if (rename($outputfiletmp,$outputfile)) $result=1;
if (dol_move($outputfiletmp,$outputfile,0,1)) $result=1;
else
{
dol_syslog(get_class($this)."::build_exportfile failed to rename ".$outputfiletmp." to ".$outputfile, LOG_ERR);
$this->error='Failed to rename '.$outputfiletmp.' into '.$outputfile;
dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
dol_delete_file($outputfiletmp,0,1);
$result=-1;
}

2
htdocs/comm/fiche.php
View File

@ -268,7 +268,7 @@ if ($id > 0)
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// Skype
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<td>'.$langs->trans('Skype').'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->id,'AC_SKYPE').'</td></tr>';
}

4
htdocs/compta/journal/purchasesjournal.php
View File

@ -61,7 +61,9 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin
* View
*/
llxHeader('',$langs->trans("PurchasesJournal"),'');
$morequery='&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
llxHeader('',$langs->trans("PurchasesJournal"),'','',0,0,'','',$morequery);
$form=new Form($db);

4
htdocs/compta/journal/sellsjournal.php
View File

@ -64,7 +64,9 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin
$form=new Form($db);
llxHeader('',$langs->trans("SellsJournal"),'');
$morequery='&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
llxHeader('',$langs->trans("SellsJournal"),'','',0,0,'','',$morequery);
$year_current = strftime("%Y",dol_now());

22
htdocs/compta/paiement/cheque/fiche.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2007-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -60,7 +61,6 @@ $offset = $limit * $page ;
$dir=$conf->banque->dir_output.'/bordereau/';
$filterdate=dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
$filteraccountid=GETPOST('accountid');
//var_dump($_POST);
$object = new RemiseCheque($db);
@ -80,12 +80,12 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
$result=$object->set_date($user,$date);
if ($result < 0)
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
else
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
@ -103,12 +103,12 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
$result=$object->setValueFrom('ref_ext', $ref_ext);
if ($result < 0)
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
else
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
@ -140,12 +140,12 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
}
else
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
else
{
$mesg=$langs->trans("ErrorSelectAtLeastOne");
setEventMessage($langs->trans("ErrorSelectAtLeastOne"));
$action='new';
}
}
@ -161,7 +161,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq
}
else
{
$mesg='<div class="error">'.$object->error.'</div>';
setEventMessage($object->error, 'errors');
}
}
@ -176,7 +176,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
}
else
{
$mesg='<div class="error">'.$paiement->error.'</div>';
setEventMessage($paiement->error, 'errors');
}
}
@ -203,7 +203,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
}
else
{
$mesg='<div class="error">'.$paiement->error.'</div>';
setEventMessage($paiement->error, 'errors');
}
}
@ -582,7 +582,7 @@ else
$param="&amp;id=".$object->id;
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Cheque"),'','','','','width="30"');
print_liste_field_titre($langs->trans("Cheques"),'','','','','width="30"');
print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.dateo,b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CheckTransmitter"),$_SERVER["PHP_SELF"],"b.emetteur", "",$param,"",$sortfield,$sortorder);

2
htdocs/compta/tva/index.php
View File

@ -222,7 +222,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
$sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
$sql.= " GROUP BY dm ASC";
$sql.= " GROUP BY dm ORDER BY dm ASC";
pt($db, $sql,$langs->trans("Year")." $y");

6
htdocs/contact/fiche.php
View File

@ -526,7 +526,7 @@ else
print '<tr><td>'.$langs->trans("IM").'</td><td colspan="3"><input name="jabberid" type="text" size="50" maxlength="80" value="'.(isset($_POST["jabberid"])?$_POST["jabberid"]:$object->jabberid).'"></td></tr>';
// Skype
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td colspan="3"><input name="skype" type="text" size="50" maxlength="80" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
}
@ -733,7 +733,7 @@ else
print '</tr>';
// Skype
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td><input name="skype" type="text" size="40" maxlength="80" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
}
@ -952,7 +952,7 @@ else
print '</tr>';
// Skype
if (!empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<tr><td>'.$langs->trans("Skype").'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
}

6
htdocs/contact/list.php
View File

@ -292,7 +292,7 @@ if ($result)
print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mob", $begin, $param, '', $sortfield,$sortorder);
print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder);
print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder);
if (! empty($conf->skype->enabled)) { print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder); }
if (! empty($conf->skype->enabled) && $user->rights->skype->view) { print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder); }
print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder);
print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut", $begin, $param, 'align="center"', $sortfield,$sortorder);
@ -328,7 +328,7 @@ if ($result)
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_email" size="8" value="'.$search_email.'">';
print '</td>';
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_skype" size="8" value="'.$search_skype.'">';
@ -397,7 +397,7 @@ if ($result)
// EMail
print '<td>'.dol_print_email($obj->email,$obj->cidp,$obj->socid,'AC_EMAIL',18).'</td>';
// Skype
if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->cidp,$obj->socid,'AC_SKYPE',18).'</td>'; }
if (! empty($conf->skype->enabled) && $user->rights->skype->view) { print '<td>'.dol_print_skype($obj->skype,$obj->cidp,$obj->socid,'AC_SKYPE',18).'</td>'; }
// Date
print '<td align="center">'.dol_print_date($db->jdate($obj->tms),"day").'</td>';

2
htdocs/contrat/class/contrat.class.php
View File

@ -2089,7 +2089,7 @@ class ContratLigne
$sql.= " total_localtax1='".$this->total_localtax1."',";
$sql.= " total_localtax2='".$this->total_localtax2."',";
$sql.= " total_ttc='".$this->total_ttc."',";
$sql.= " fk_product_fournisseur_price='".$this->fk_fournprice."',";
$sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
$sql.= " info_bits='".$this->info_bits."',";
$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";

2
htdocs/core/class/html.form.class.php
View File

@ -195,7 +195,7 @@ class Form
}
else
{
if ($typeofdata == 'email') $ret.=dol_print_email($value,0,0,0,0,1);
if ($typeofdata == 'email') $ret.=dol_print_email($value,0,0,0,0,1);
elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs) : '');
elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata)) $ret.=dol_htmlentitiesbr($value);
elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');

234
htdocs/core/lib/agenda.lib.php
View File

@ -43,129 +43,125 @@
* @param string $actioncode Preselected value of actioncode for filter on type
* @return void
*/
function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$showextcals=array(),$actioncode='')
{
global $conf,$user,$langs,$db;
function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals=array(), $actioncode='') {
global $conf, $user, $langs, $db;
// Filters
if ($canedit || ! empty($conf->projet->enabled))
print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER ["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
print '<input type="hidden" name="status" value="' . $status . '">';
print '<input type="hidden" name="year" value="' . $year . '">';
print '<input type="hidden" name="month" value="' . $month . '">';
print '<input type="hidden" name="day" value="' . $day . '">';
print '<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
print '<table class="nobordernopadding" width="100%">';
print '<tr><td class="nowrap">';
print '<table class="nobordernopadding">';
if ($canedit)
{
print '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="status" value="'.$status.'">';
print '<input type="hidden" name="year" value="'.$year.'">';
print '<input type="hidden" name="month" value="'.$month.'">';
print '<input type="hidden" name="day" value="'.$day.'">';
print '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
print '<table class="nobordernopadding" width="100%">';
if ($canedit || ! empty($conf->projet->enabled))
{
print '<tr><td class="nowrap">';
print '<table class="nobordernopadding">';
if ($canedit)
{
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("ActionsAskedBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filtera,'userasked',1,'',!$canedit);
print '</td>';
print '</tr>';
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("or").' '.$langs->trans("ActionsToDoBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filtert,'usertodo',1,'',!$canedit);
print '</td></tr>';
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("or").' '.$langs->trans("ActionsDoneBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filterd,'userdone',1,'',!$canedit);
print '</td></tr>';
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("Type");
print ' &nbsp;</td><td class="nowrap">';
print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0));
print '</td></tr>';
}
if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
$formproject=new FormProjets($db);
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("Project").' &nbsp; ';
print '</td><td class="nowrap">';
$formproject->select_projects($socid?$socid:-1, $pid, 'projectid', 64);
print '</td></tr>';
}
print '</table>';
print '</td>';
// Buttons
print '<td align="center" valign="middle" class="nowrap">';
print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" class="button" style="min-width:120px" name="viewcal" value="'.$langs->trans("ViewCal").'">';
print '<br>';
print img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" class="button" style="min-width:120px" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
print '<br>';
print img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" class="button" style="min-width:120px" name="viewday" value="'.$langs->trans("ViewDay").'">';
print '<br>';
print img_picto($langs->trans("ViewList"),'object_list','class="hideonsmartphone"').' <input type="submit" class="button" style="min-width:120px" name="viewlist" value="'.$langs->trans("ViewList").'">';
print '</td>';
// Legend
if ($conf->use_javascript_ajax && is_array($showextcals))
{
print '<td align="center" valign="middle" class="nowrap">';
print '<script type="text/javascript">'."\n";
print 'jQuery(document).ready(function () {'."\n";
print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
print 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
print 'jQuery(".family_birthday").toggle();'."\n";
print '});'."\n";
print '</script>'."\n";
print '<table>';
if (! empty($conf->global->MAIN_JS_SWITCH_AGENDA))
{
if (count($showextcals) > 0)
{
print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> '.$langs->trans("LocalAgenda").'</td></tr>';
foreach($showextcals as $val)
{
$htmlname=dol_string_nospecial($val['name']);
print '<script type="text/javascript">'."\n";
print 'jQuery(document).ready(function () {'."\n";
print 'jQuery("#check_'.$htmlname.'").click(function() { jQuery(".family_'.$htmlname.'").toggle(); });'."\n";
print '});'."\n";
print '</script>'."\n";
print '<tr><td><input type="checkbox" id="check_'.$htmlname.'" name="check_'.$htmlname.'" checked="true"> '.$val['name'].'</td></tr>';
}
}
}
print '<tr><td><input type="checkbox" id="check_birthday" name="check_birthday checked="false"> '.$langs->trans("AgendaShowBirthdayEvents").'</td></tr>';
print '</table>';
print '</td>';
}
print '</tr>';
}
print '</table>';
print '</form>';
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("ActionsAskedBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
print '</td>';
print '</tr>';
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("or") . ' ' . $langs->trans("ActionsToDoBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
print '</td></tr>';
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy");
print ' &nbsp;</td><td class="nowrap">';
print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit);
print '</td></tr>';
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("Type");
print ' &nbsp;</td><td class="nowrap">';
print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0));
print '</td></tr>';
}
if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
$formproject=new FormProjets($db);
print '<tr>';
print '<td class="nowrap">';
print $langs->trans("Project").' &nbsp; ';
print '</td><td class="nowrap">';
$formproject->select_projects($socid?$socid:-1, $pid, 'projectid', 64);
print '</td></tr>';
}
print '</table>';
print '</td>';
// Buttons
print '<td align="center" valign="middle" class="nowrap">';
print img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewcal" value="' . $langs->trans("ViewCal") . '">';
print '<br>';
print img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewweek" value="' . $langs->trans("ViewWeek") . '">';
print '<br>';
print img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewday" value="' . $langs->trans("ViewDay") . '">';
print '<br>';
print img_picto($langs->trans("ViewList"), 'object_list', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewlist" value="' . $langs->trans("ViewList") . '">';
print '</td>';
// Legend
if ($conf->use_javascript_ajax && is_array($showextcals))
{
print '<td align="center" valign="middle" class="nowrap">';
print '<script type="text/javascript">' . "\n";
print 'jQuery(document).ready(function () {' . "\n";
print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
print 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
print 'jQuery(".family_birthday").toggle();' . "\n";
print '});' . "\n";
print '</script>' . "\n";
print '<table>';
if (! empty($conf->global->MAIN_JS_SWITCH_AGENDA))
{
if (count($showextcals) > 0)
{
print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda") . '</td></tr>';
foreach ($showextcals as $val)
{
$htmlname = dol_string_nospecial($val['name']);
print '<script type="text/javascript">' . "\n";
print 'jQuery(document).ready(function () {' . "\n";
print 'jQuery("#check_' . $htmlname . '").click(function() { jQuery(".family_' . $htmlname . '").toggle(); });' . "\n";
print '});' . "\n";
print '</script>' . "\n";
print '<tr><td><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . '</td></tr>';
}
}
}
print '<tr><td><input type="checkbox" id="check_birthday" name="check_birthday checked="false"> ' . $langs->trans("AgendaShowBirthdayEvents") . '</td></tr>';
print '</table>';
print '</td>';
}
print '</tr>';
print '</table>';
print '</form>';
}

6
htdocs/core/lib/ajax.lib.php
View File

@ -146,11 +146,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
}
// Update an input
if (ui.item.update) {
// clear old data before update
$.each(ui.item.update, function(key, value) {
$("#" + key).val("");
});
// update fields
// loop on each "update" fields
$.each(ui.item.update, function(key, value) {
$("#" + key).val(value).trigger("change");
});

21
htdocs/core/lib/company.lib.php
View File

@ -1,12 +1,13 @@
<?php
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Christophe Battarel <contact@altairis.fr>
* *
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@ -576,7 +577,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email","",$param,'',$sortfield,$sortorder);
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
$colspan++;
print '<td>'.$langs->trans("Skype").'</td>';
@ -608,8 +609,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
if (! empty($conf->skype->enabled))
print '<td>&nbsp;</td>';
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
$colspan++;
print '<td>&nbsp;</td>';
@ -681,7 +682,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print '<td>';
print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
print '</td>';
if (! empty($conf->skype->enabled))
if (! empty($conf->skype->enabled) && $user->rights->skype->view)
{
print '<td>';
print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');

15
htdocs/core/lib/files.lib.php
View File

@ -531,13 +531,24 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
$result=false;
dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
if ($overwriteifexists || ! dol_is_file($destfile))
$destexists=dol_is_file($destfile);
if ($overwriteifexists || ! $destexists)
{
$newpathofsrcfile=dol_osencode($srcfile);
$newpathofdestfile=dol_osencode($destfile);
$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
if (! $result) dol_syslog("files.lib.php::dol_move failed", LOG_WARNING);
if (! $result)
{
if ($destexists)
{
dol_syslog("files.lib.php::dol_move failed. We try to delete first and move after.", LOG_WARNING);
// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
dol_delete_file($destfile);
$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
}
else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING);
}
if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
@chmod($newpathofsrcfile, octdec($newmask));
}

19
htdocs/core/lib/functions.lib.php
View File

@ -1190,11 +1190,11 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
* Show Skype link
*
* @param string $skype Skype to show (only skype, without 'Name of recipient' before)
* @param int $cid Id of contact if known
* @param int $cid Id of contact if known
* @param int $socid Id of third party if known
* @param int $addlink 0=no link to create action
* @param int $max Max number of characters to show
* @return string HTML Link
* @param int $max Max number of characters to show
* @return string HTML Link
*/
function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
{
@ -1208,9 +1208,12 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
{
$newskype='<a href="skype:';
$newskype.=dol_trunc($skype,$max);
$newskype.='" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
$newskype.='<img src="../theme/'.$conf->theme.'/img/object_skype.png" border="0">&nbsp;';
$newskype.='?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
$newskype.='<img src="../theme/common/skype_callbutton.png" border="0">&nbsp;';
$newskype.='</a>&nbsp;<a href="skype:';
$newskype.=dol_trunc($skype,$max);
$newskype.='?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
$newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">&nbsp;';
$newskype.='</a>';
if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
@ -2358,7 +2361,7 @@ function dol_print_error_email($prefixcode)
* @param string $field Field to use for new sorting
* @param string $begin ("" by defaut)
* @param string $moreparam Add more parameters on sort url links ("" by default)
* @param string $td Options of attribute td ("" by defaut)
* @param string $td Options of attribute td ("" by defaut, example: 'align="center"')
* @param string $sortfield Current field used to sort
* @param string $sortorder Current sort order
* @return void
@ -2395,8 +2398,8 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
// If field is used as sort criteria we use a specific class
// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel" '. $moreattrib.'>';
else $out.= '<'.$tag.' class="liste_titre" '. $moreattrib.'>';
if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel'.($field?' nowrap':'').'" '. $moreattrib.'>';
else $out.= '<'.$tag.' class="liste_titre'.($field?' nowrap':'').'" '. $moreattrib.'>';
if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field) // If this is a sort field
{

4
htdocs/core/lib/xcal.lib.php
View File

@ -484,7 +484,7 @@ function quotedPrintEncode($str,$forcal=0)
{
$newpara = '';
$strlength=dol_strlen($line);
$strlength=strlen($line); // Do not use dol_strlen here, we need number of bytes
for ($j = 0; $j <= ($strlength - 1); $j++)
{
$char = substr($line, $j, 1);
@ -493,7 +493,7 @@ function quotedPrintEncode($str,$forcal=0)
if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
$char = '=' . strtoupper(sprintf("%02X", $ascii));
if ((dol_strlen($newpara) + dol_strlen($char)) >= 76 )
if ((strlen($newpara) + strlen($char)) >= 76 ) // Do not use dol_strlen here, we need number of bytes
{
$out .= $newpara . '=' . "\r\n"; // CRLF
if ($forcal) $out .= " "; // + Space for cal

47
htdocs/core/modules/modAgenda.class.php
View File

@ -362,30 +362,33 @@ class modAgenda extends DolibarrModules
// Exports
//--------
$r=0;
$r++;
$this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]="ExportDataset_event1";
$this->export_permission[$r]=array(array("agenda","export"));
$this->export_fields_array[$r]=array('a.id'=>'IdAgenda','a.label'=>'Actions','a.datep'=>'DateActionStart',
'a.datea'=>'DateActionEnd','a.percent'=>'PercentDone','a.fk_user_author'=>'ActionAskedBy','a.fk_user_action'=>'ActionAffectedTo',
'a.fk_user_done'=>"ActionDoneBy","a.priority"=>"Priority","a.fulldayevent"=>"EventOnFullDay","a.location"=>"Location",
"a.fk_soc"=>"ThirdParty","a.fk_contact"=>"ThirdPartyContact","a.fk_action"=>"Type");
$this->export_TypeFields_array[$r]=array('a.id'=>'Numeric','a.label'=>'Text','a.datep'=>'Date','a.datep2'=>'Date',
'a.datea'=>'Date','a.datea2'=>'Date','a.percent'=>'Numeric','a.fk_user_author'=>'List:user:name','a.fk_user_action'=>'List:user:name',
'a.fk_user_done'=>"List:user:name","a.priority"=>"Numeric","a.fulldayevent"=>"Boolean","a.location"=>"Text",
"a.fk_soc"=>"List:Societe:nom","a.fk_contact"=>"List:socpeople:name","a.fk_action"=>"List:c_actioncomm:libelle:code");
$this->export_entities_array[$r]=array('a.id'=>'action','a.label'=>'action','a.datep'=>'action','a.datep2'=>'action',
'a.datea'=>'action','a.datea2'=>'action','a.percent'=>'action','a.fk_user_author'=>'action','a.fk_user_action'=>'action',
'a.fk_user_done'=>"action","a.priority"=>"action","a.fulldayevent"=>"action","a.location"=>"action",
"a.fk_soc"=>"action","a.fk_contact"=>"action","a.fk_action"=>"action");
$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
'cp.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4',
's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra',
'ac.id'=>"ActionId",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"ActionDateCreation",'ac.datep'=>"DateActionBegin",
'ac.datep2'=>"DateActionEnd",'ac.label'=>"Label",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"durationp",
'cac.libelle'=>"ActionType");
$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
'cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text',
's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text',
'ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Number",
'ac.durationp'=>"Duree",
'cac.libelle'=>"List:c_actioncomm:libelle:rowid");
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
'cp.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',
'ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
'cac.libelle'=>"action");
$this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
$this->export_sql_end[$r] .=' Where a.entity = '.$conf->entity;
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'actioncomm as ac';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as cp on s.fk_pays = cp.rowid';
$this->export_sql_end[$r] .=' Where ac.entity = '.$conf->entity;
$this->export_sql_end[$r] .=' ORDER BY datep';
}

114
htdocs/core/tpl/objectline_add.tpl.php
View File

@ -153,9 +153,9 @@ if (! empty($conf->margin->enabled)) {
<?php
// Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
$doleditor=new DolEditor('product_desc', GETPOST('product_desc'), '', 150, 'dolibarr_details', '', false, true, $enable, $nbrows, 70);
$doleditor->Create();
?>
@ -242,7 +242,6 @@ $(document).ready(function() {
$('#service_duration_area').hide();
$('#idprod').change(function() {
if ($(this).val() > 0) {
// Update vat rate combobox
@ -260,11 +259,11 @@ $(document).ready(function() {
if (typeof data != 'undefined') {
$('#product_ref').val(data.ref);
$('#product_label').val(data.label);
$('#origin_tva_tx_cache').val(data.tva_tx);
$('#price_base_type').val(data.pricebasetype).trigger('change');
$('#price_ht').val(data.price_ht).trigger('change');
$('#origin_price_ht_cache').val(data.price_ht);
//$('#origin_price_ttc_cache').val(data.price_ttc);
$('#origin_tva_tx_cache').val(data.tva_tx);
$('#select_type').val(data.type).attr('disabled','disabled').trigger('change');
//$('#price_base_type_area').show();
$('#qty').val(data.qty);
@ -279,14 +278,11 @@ $(document).ready(function() {
}, 'json');
<?php } ?>
} else {
} else {
$('#price_ttc').val('');
$('#price_ttc').val('');
// Restore vat rate combobox
getVATRates('getSellerVATRates', 'tva_tx');
// For compatibility with combobox
// For compatibility with combobox
<?php if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) { ?>
$('#select_type').val('').removeAttr('disabled').trigger('change');
$('#product_ref').val('');
@ -423,54 +419,66 @@ $(document).ready(function() {
});
function update_price(input, output) {
$.post('<?php echo DOL_URL_ROOT; ?>/core/ajax/price.php', {
'amount': $('#' + input).val(),
'output': output,
'tva_tx': $('#tva_tx').val()
},
function(data) {
var addline=false;
if (typeof data[output] != 'undefined') {
// Hide price_ttc if no vat
//if ($('#tva_tx').val() > 0 || ($('#tva_tx').val() == 0 && output == 'price_ht')) {
$('#' + output).val(data[output]);
//}
if ($('#idprod').val() == 0 && $('#select_type').val() >= 0) {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined' && CKEDITOR.instances['product_desc'] != 'undefined') {
var content = CKEDITOR.instances['product_desc'].getData();
$.ajax({
type: 'POST',
url: '<?php echo DOL_URL_ROOT; ?>/core/ajax/price.php',
data: {
'amount': $('#' + input).val(),
'output': output,
'tva_tx': $('#tva_tx').val()
},
success: function(data) {
var addline=false;
if (typeof data[output] != 'undefined') {
// Hide price_ttc if no vat
//if ($('#tva_tx').val() > 0 || ($('#tva_tx').val() == 0 && output == 'price_ht')) {
$('#' + output).val(data[output]);
//}
if ($('#idprod').val() == 0 && $('#select_type').val() >= 0) {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined' && CKEDITOR.instances['product_desc'] != 'undefined') {
var content = CKEDITOR.instances['product_desc'].getData();
} else {
var content = $('#product_desc').val();
}
if (content.length > 0) {
addline=true;
}
} else {
var content = $('#product_desc').val();
}
if (content.length > 0) {
addline=true;
}
} else {
addline=true;
$('#' + input).val('');
$('#' + output).val('');
}
} else {
$('#' + input).val('');
$('#' + output).val('');
}
if (addline) {
$('#addlinebutton').removeAttr('disabled');
} else {
$('#addlinebutton').attr('disabled','disabled');
}
}, 'json');
if (addline) {
$('#addlinebutton').removeAttr('disabled');
} else {
$('#addlinebutton').attr('disabled','disabled');
}
},
dataType: 'json',
async: false});
}
function getVATRates(action, htmlname, idprod) {
var productid = (idprod?idprod:0);
$.post('<?php echo DOL_URL_ROOT; ?>/core/ajax/vatrates.php', {
'action': action,
'id': <?php echo $buyer->id; ?>,
'productid': productid,
'htmlname': htmlname },
function(data) {
if (typeof data != 'undefined' && data.error == null) {
$("#" + htmlname).html(data.value).trigger('change');
}
}, 'json');
$.ajax({
type: "POST",
url: '<?php echo DOL_URL_ROOT;?>/core/ajax/vatrates.php',
data: {
'action': action,
'id': <?php echo $buyer->id; ?>,
'productid': productid,
'htmlname': htmlname
},
success: function(data){
if (typeof data != 'undefined' && data.error == null) {
$("#" + htmlname).html(data.value).trigger('change');
}
},
dataType: "json",
async: false
});
}
// Check if decription is not empty for free line
@ -519,7 +527,7 @@ $("#idprod").change(function() {
$("#fournprice").empty();
$("#buying_price").show();
if ($(this).val() > 0)
{
{
$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) {
if (data && data.length > 0) {
var options = '';
@ -550,8 +558,8 @@ $("#idprod").change(function() {
}
},
'json');
} else {
$("#fournprice").hide();
} else {
$("#fournprice").hide();
$('#buying_price').val('');
}
});

2
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
View File

@ -183,7 +183,7 @@ class InterfaceMailmanSpipsynchro
// Add user into some linked tools (mailman, spip, etc...)
if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) // TODO Do del/add also if type change
{
if ($object->oldcopy->email != $object->email) // If email has changed we delete mailman subscription for old email
if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email)) // If email has changed we delete mailman subscription for old email
{
if ($object->oldcopy->del_to_abo() < 0)
{

2
htdocs/filefunc.inc.php
View File

@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.0-beta');
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0-alpha');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants

10
htdocs/fourn/commande/fiche.php
View File

@ -1226,9 +1226,9 @@ elseif (! empty($object->id))
// Ref supplier
print '<tr><td>';
print $form->editfieldkey("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
print '</td><td colspan="2">';
print $form->editfieldval("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
print '</td></tr>';
// Fournisseur
@ -1678,9 +1678,9 @@ elseif (! empty($object->id))
print '<td colspan="3">';
$ajaxoptions=array(
'update' => array('qty_predef' => 'qty_predef', 'remise_percent_predef' => 'remise_percent_predef'),
'option_disabled' => 'addPredefinedProductButton',
'error' => $langs->trans("NoPriceDefinedForThisSupplier")
'update' => array('qty_predef'=>'qty','remise_percent_predef' => 'discount'), // html id tag will be edited with which ajax json response key
'option_disabled' => 'addPredefinedProductButton', // html id to disable once select is done
'error' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error'
);
$form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions);

6
htdocs/fourn/facture/fiche.php
View File

@ -2116,9 +2116,9 @@ else
print '<td colspan="4">';
$ajaxoptions=array(
'update' => array('qty_predef' => 'qty_predef', 'remise_percent_predef' => 'remise_percent_predef'),
'disabled' => 'addPredefinedProductButton',
'error' => $langs->trans("NoPriceDefinedForThisSupplier")
'update' => array('qty_predef'=>'qty','remise_percent_predef' => 'discount'), // html id tag will be edited with which ajax json response key
'disabled' => 'addPredefinedProductButton', // html id to disable once select is done
'error' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error'
);
$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions);

9
htdocs/install/mysql/migration/2.1.0-2.2.0.sql
View File

@ -71,12 +71,13 @@ update llx_bank set dateo = datec where datev = '1970-01-01 00:00:00' and rappro
alter table llx_c_chargesociales add column actioncompta varchar(12) NOT NULL;
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Deductible', 1,1,'TAXCSGD');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Deductible',0,1,'TAXCSGND');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprenttissage', 0,1,'TAXAPP');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Déductible', 1,1,'TAXCSGD');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Déductible',0,1,'TAXCSGND');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprentissage', 0,1,'TAXAPP');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle', 0,1,'TAXPRO');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (12, 'Contribution à la formation professionnelle', 1,1,'TAXOPCA');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Sante (SECU-URSSAF)', 0,1,'TAXSECU');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Santé (SECU-URSSAF)', 0,1,'TAXSECU');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle', 0,1,'TAXMUT');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)', 0,1,'TAXRET');
insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)', 0,1,'TAXCHOM');

20
htdocs/install/mysql/migration/3.5.0-3.6.0.sql Executable file
View File

@ -0,0 +1,20 @@
--
-- Be carefull to requests order.
-- This file must be loaded by calling /install/index.php page
-- when current version is 3.5.0 or higher.
--
-- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new;
-- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
-- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
-- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname;
-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
-- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
-- To restrict request to Mysql version x.y use -- VMYSQLx.y
-- To restrict request to Pgsql version x.y use -- VPGSQLx.y
-- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
-- To make pk to be auto increment (postgres) VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);

2
htdocs/langs/ca_ES/other.lang
View File

@ -138,10 +138,12 @@ StatsByNumberOfEntities=Estadístiques en nombre d'identitats referents
NumberOfProposals=Nombre de pressupostos en els darrers 12 mesos
NumberOfCustomerOrders=Nombre de comandes de clients en els darrers 12 mesos
NumberOfCustomerInvoices=Nombre de factures a clients en els darrers 12 mesos
NumberOfSupplierOrders=Nombre de comandes a proveïdors en els darrers 12 mesos
NumberOfSupplierInvoices=Nombre de factures de proveïdors en els darrers 12 mesos
NumberOfUnitsProposals=Nombre d'unitats en els pressupostos en els darrers 12 mesos
NumberOfUnitsCustomerOrders=Nombre d'unitats en les comandes de clients en els darrers 12 mesos
NumberOfUnitsCustomerInvoices=Nombre d'unitats en les factures a clients en els darrers 12 mesos
NumberOfUnitsSupplierInvoices=Nombre d'unitats en les comandes a proveïdors en els darrers 12 mesos
NumberOfUnitsSupplierInvoices=Nombre d'unitats en les factures de proveïdors en els darrers 12 mesos
EMailTextInterventionValidated=Fitxa intervenció %s validada
EMailTextInvoiceValidated=Factura %s validada

36
htdocs/langs/el_GR/compta.lang
View File

@ -3,7 +3,7 @@ Accountancy=Λογιστική
AccountancyCard=Καρτέλα λογιστικής
Treasury=Περιουσιακά
MenuFinancial=Οικονομικά
# TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
TaxModuleSetupToModifyRules=Πηγαίνετε στο <a href="%s">setup Φόροι module</a> να τροποποιήσετε τους κανόνες για τον υπολογισμό
OptionMode=Επιλογές λογιστικής
OptionModeTrue=Επιλογές εσόδων-εξόδων
OptionModeVirtual=Option Claims-Debts
@ -102,12 +102,12 @@ ConfirmPaySocialContribution=Are you sure you want to classify this social contr
DeleteSocialContribution=Διαγραφή κοινωνικής εισφοράς
ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε την κοινωνική εισφορά;
ExportDataset_tax_1=Social contributions and payments
# CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
# CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
# CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
# CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
# AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
# AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
CalcModeDebt=Κατάσταση <b>%sΑπαιτήσεις-Οφειλές%s</b> δήλωσε <b>Λογιστικών υποχρεώσεων</b>.
CalcModeEngagement=Κατάσταση <b>%sεσόδων-έξοδα%s</b> δήλωσε <b>ταμειακή λογιστική</b>
AnnualSummaryDueDebtMode=Υπόλοιπο των εσόδων και εξόδων, ετήσια σύνοψη
AnnualSummaryInputOutputMode=Υπόλοιπο των εσόδων και εξόδων, ετήσια σύνοψη
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
@ -120,13 +120,13 @@ RulesCAIn=- It includes all the effective payments of invoices received from cli
DepositsAreNotIncluded=- Τα τιμολόγια ασφαλείας ούτε περιλαμβάνονται
DepositsAreIncluded=- Περιλαμβάνονται τιμολόγια ασφαλείας
LT2ReportByCustomersInInputOutputModeES=Έκθεση του τρίτου IRPF
# VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
# VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
# VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
# VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
VATReportByCustomersInInputOutputMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
VATReportByCustomersInDueDebtMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
VATReportByQuartersInInputOutputMode=Αναφορά συντελεστή του ΦΠΑ που εισπράττεται και καταβάλλεται
VATReportByQuartersInDueDebtMode=Αναφορά συντελεστή του ΦΠΑ που εισπράττεται και καταβάλλεται
SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
# RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
RulesVATInServices=- Για τις υπηρεσίες, η αναφορά περιλαμβάνει τους κανονισμούς ΦΠΑ που πράγματι εισπράχθηκαν ή εκδίδονται με βάση την ημερομηνία πληρωμής.
RulesVATInProducts=- Για τα υλικά περιουσιακά στοιχεία, περιλαμβάνει τα τιμολόγια ΦΠΑ, με βάση την ημερομηνία έκδοσης του τιμολογίου.
RulesVATDueServices=- Για τις υπηρεσίες, η έκθεση περιλαμβάνει τα τιμολόγια ΦΠΑ που οφείλεται, αμειβόμενη ή μη, με βάση την ημερομηνία έκδοσης του τιμολογίου.
RulesVATDueProducts=- Για τα υλικά περιουσιακά στοιχεία, περιλαμβάνει τα τιμολόγια ΦΠΑ, με βάση την ημερομηνία έκδοσης του τιμολογίου.
@ -159,13 +159,13 @@ AccountancyDashboard=Accountancy summary
ByProductsAndServices=By products and services
RefExt=Εξωτερικές αναφορές
# ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
# LinkedOrder=linked to command
LinkedOrder=συνδέονται με την εντολή
ReCalculate=Επανυπολογισμός
# Mode1=Methode 1
# Mode2=Method 2
Mode1=Τρόπος 1
Mode2=Τρόπος 2
# CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
# CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
# TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
# CalculationMode=Calculation mode
# COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
# COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
CalculationMode=Τρόπο υπολογισμού
COMPTA_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη
COMPTA_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή

16
htdocs/langs/el_GR/mails.lang
View File

@ -78,7 +78,7 @@ YourMailUnsubcribeOK=The email <b>%s</b> is correctly unsubcribe from mailing l
MailtoEMail=Hyper σύνδεσμο σε email
ActivateCheckRead=Επιτρέπετε τη χρήση του "Unsubcribe" σύνδεσμου
# ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
# EMailSentToNRecipients=EMail sent to %s recipients.
EMailSentToNRecipients=EMail αποστέλλονται στους παραλήπτες %s.
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Επαφές για όλα τα στοιχεία (πελάτης, προοπτική, προμηθευτής, ...)
@ -89,12 +89,12 @@ MailingModuleDescEmailsFromFile=EMails from a text file (email;name;surname;comm
MailingModuleDescContactsCategories=Στοιχεία με emails (ανά κατηγορία)
# MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
MailingModuleDescContactsByCompanyCategory=Επαφές των τρίτων (από τρίτη κατηγορία μέρη)
# MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
MailingModuleDescContactsByCategory=Επαφές/διευθύνσεις Πέλ./Προμ. κατά κατηγορία
MailingModuleDescMembersCategories=Τα ιδρυτικά μέλη (ανά κατηγορία)
MailingModuleDescContactsByFunction=Επαφές των τρίτων (από τη θέση / λειτουργία)
# LineInFile=Line %s in file
LineInFile=Σειρά %s στο αρχείο
# RecipientSelectionModules=Defined requests for recipient's selection
MailSelectedRecipients=Επιλεγμένοι αποδέκτες
MailingArea=Emailings περιοχή
@ -117,7 +117,7 @@ ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγο
IdRecord=ID record
DeliveryReceipt=Απόδειξη παράδοσης
# YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
# TagCheckMail=Track mail opening
TagCheckMail=Παρακολούθηση άνοιγμα της αλληλογραφίας
TagUnsubscribe=link διαγραφής
TagSignature=Υπογραφή αποστολής χρήστη
TagMailtoEmail=Email του παραλήπτη
@ -125,8 +125,8 @@ TagMailtoEmail=Email του παραλήπτη
# Module Notifications
Notifications=Notifications
# NoNotificationsWillBeSent=No email notifications are planned for this event and company
# ANotificationsWillBeSent=1 notification will be sent by email
ANotificationsWillBeSent=1 ειδοποίηση θα σταλεί μέσω e-mail
# SomeNotificationsWillBeSent=%s notifications will be sent by email
# AddNewNotification=Activate a new email notification request
# ListOfActiveNotifications=List all active email notification requests
# ListOfNotificationsDone=List all email notifications sent
AddNewNotification=Ενεργοποιήστε μια νέα αίτηση ειδοποίησης με email
ListOfActiveNotifications=Λίστα όλων των ενεργών αιτήσεων ειδοποίησης με email
ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται

26
htdocs/langs/el_GR/stocks.lang
View File

@ -26,14 +26,14 @@ ListOfStockMovements=Κατάλογος των κινήσεων των αποθ
StocksArea=Αποθέματα περιοχή
Location=Τοποθεσία
LocationSummary=Σύντομη τοποθεσία όνομα
# NumberOfDifferentProducts=Number of different products
NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων
NumberOfProducts=Συνολικός αριθμός προϊόντων
LastMovement=Τελευταία κίνηση
LastMovements=Τελευταία κινήσεις
Units=Μονάδες
Unit=Μονάδα
StockCorrection=Σωστή απόθεμα
# StockTransfer=Stock transfer
StockTransfer=Stock Μεταφορά
StockMovement=Μεταφορά
StockMovements=Μεταφορές Χρηματιστήριο
# LabelMovement=Movement label
@ -96,16 +96,16 @@ Replenishment=Αναπλήρωση
ReplenishmentOrders=Αναπλήρωση παραγγελίων
UseVirtualStock=Χρησιμοποιήστε το εικονικό απόθεμα αντί των φυσικών αποθεμάτων
RuleForStockReplenishment=Κανόνας για τα αποθέματα αναπλήρωσης
# SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
# AlertOnly= Alerts only
# WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
# WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
# ForThisWarehouse=For this warehouse
SelectProductWithNotNullQty=Επιλέξτε τουλάχιστον ένα προϊόν με ποσότητα δεν είναι έγκυρη σε προμηθευτή
AlertOnly= Ειδοποιήσεις μόνο
WarehouseForStockDecrease=Η αποθήκη <b>%s</b> να να χρησιμοποιηθεί για μείωση αποθεμάτων
WarehouseForStockIncrease=Η αποθήκη <b>%s</b> θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
ForThisWarehouse=Για αυτή την αποθήκη
# ReplenishmentStatusDesc=This is list of all product with a physical stock lower than desired stock (or alert value if checkbox "alert only" is checked) and suggest you to create supplier orders to fill the difference.
# ReplenishmentOrdersDesc=This is list of all opened supplier orders
# Replenishments=Replenishments
# NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
# NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
# MassStockMovement=Mass stock movement
ReplenishmentOrdersDesc=Αυτή είναι η λίστα όλων των ανοικτών παραγγελιών σε προμηθευτές
Replenishments=Αναπληρώσεις
NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
MassStockMovement=Μαζική κίνηση αποθεμάτων
# SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
# RecordMovement=Record transfert
RecordMovement=Η εγγραφή μεταφέρθηκε

3
htdocs/langs/en_US/admin.lang
View File

@ -299,6 +299,7 @@ ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on por
DoTestServerAvailability=Test server connectivity
DoTestSend=Test sending
DoTestSendHTML=Test sending HTML
ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
@ -1008,6 +1009,8 @@ XDebugInstalled=XDebug est chargé.
XCacheInstalled=XCache is loaded.
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
FieldEdition=Edition of field %s
FixTZ=TimeZone fix
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.

2
htdocs/langs/en_US/banks.lang
View File

@ -154,3 +154,5 @@ DefaultRIB=Default BAN
AllRIB=All BAN
LabelRIB=BAN Label
NoBANRecord=No BAN record
DeleteARib=Delete BAN record
ConfirmDeleteRib=Are you sure you want to delete this BAN record ?

1
htdocs/langs/en_US/companies.lang
View File

@ -68,6 +68,7 @@ CountryId=Country id
Phone=Phone
Skype=Skype
Call=Call
Chat=Chat
PhonePro=Prof. phone
PhonePerso=Pers. phone
PhoneMobile=Mobile

7
htdocs/langs/en_US/compta.lang
View File

@ -30,6 +30,7 @@ Profit=Profit
Balance=Balance
Debit=Debit
Credit=Credit
Piece=Voucher
Withdrawal=Withdrawal
Withdrawals=Withdrawals
AmountHTVATRealReceived=Net collected
@ -167,5 +168,11 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=Calculation mode
COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut des achats de marchandises
COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut des ventes de marchandises
COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut des achats de services
COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut des ventes de services
COMPTA_VAT_ACCOUNT=Code comptable par défaut de la TVA collectée
COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut de la TVA déductible
COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties

1
htdocs/langs/en_US/main.lang
View File

@ -661,6 +661,7 @@ Access=Access
HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
OriginFileName=Original filename
SetDemandReason=Set source
# Week day
Monday=Monday

2
htdocs/langs/en_US/other.lang
View File

@ -138,10 +138,12 @@ StatsByNumberOfEntities=Statistics in number of referring entities
NumberOfProposals=Number of proposals on last 12 month
NumberOfCustomerOrders=Number of customer orders on last 12 month
NumberOfCustomerInvoices=Number of customer invoices on last 12 month
NumberOfSupplierOrders=Number of supplier orders on last 12 month
NumberOfSupplierInvoices=Number of supplier invoices on last 12 month
NumberOfUnitsProposals=Number of units on proposals on last 12 month
NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month
NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month
NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month
EMailTextInterventionValidated=The intervention %s has been validated.
EMailTextInvoiceValidated=The invoice %s has been validated.

2
htdocs/langs/es_ES/other.lang
View File

@ -138,10 +138,12 @@ StatsByNumberOfEntities=Estadísticas en número de identidades referentes
NumberOfProposals=Número de presupuestos en los últimos 12 meses
NumberOfCustomerOrders=Número de pedidos de clientes en los últimos 12 meses
NumberOfCustomerInvoices=Número de facturas a clientes en los últimos 12 meses
NumberOfSupplierOrders=Número de pedidos a proveedores en los últimos 12 meses
NumberOfSupplierInvoices=Número de facturas de proveedores en los últimos 12 meses
NumberOfUnitsProposals=Número de unidades en los presupuestos en los últimos 12 meses
NumberOfUnitsCustomerOrders=Número de unidades en los pedidos de clientes en los últimos 12 meses
NumberOfUnitsCustomerInvoices=Número de unidades en las facturas a clientes en los últimos 12 meses
NumberOfUnitsSupplierOrders=Número de unidades en los pedidos a proveedores en los últimos 12 meses
NumberOfUnitsSupplierInvoices=Número de unidades en las facturas de proveedores en los últimos 12 meses
EMailTextInterventionValidated=Ficha intervención %s validada
EMailTextInvoiceValidated=Factura %s validada

3
htdocs/langs/fr_FR/admin.lang
View File

@ -299,6 +299,7 @@ ServerNotAvailableOnIPOrPort=Serveur non disponible à l'adresse <b>%s</b> sur l
DoTestServerAvailability=Tester disponibilité serveur
DoTestSend=Tester envoi
DoTestSendHTML=Tester envoi HTML
ErrorCantUseRazIfNoYearInMask=Erreur, ne peut utiliser l'option @ pour remettre à zéro en début d'année si la séquence {yy} ou {yyyy} n'est pas dans le masque.
ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
@ -1050,6 +1051,8 @@ XDebugInstalled=XDebug est chargé.
XCacheInstalled=XCache est chargé.
AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou autocomplétion) et dans la pluspart des hyperliens
FieldEdition=Édition du champ %s
FixTZ=Correction du Timezone
FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
##### Module password generation
PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés.
PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement.

2
htdocs/langs/fr_FR/banks.lang
View File

@ -154,3 +154,5 @@ DefaultRIB=RIB par défaut
AllRIB=Tous les RIB
LabelRIB=Nom du RIB
NoBANRecord=Aucun RIB enregistré
DeleteARib=Supprimé RIB enregistré
ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ?

7
htdocs/langs/fr_FR/compta.lang
View File

@ -30,6 +30,7 @@ Profit=Bénéfice
Balance=Solde
Debit=Débit
Credit=Crédit
Piece=Pièce
Withdrawal=Retrait
Withdrawals=Retraits
AmountHTVATRealReceived=HT collectée
@ -167,5 +168,11 @@ CalculationRuleDesc=Pour calculer le total de TVA, il existe 2 modes:<br>Le mode
CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisissez le mode adéquat afin d'appliquer la même règle et obtenir un résultat identique au mode appliqué par votre fournisseur.
TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
CalculationMode=Mode de calcul
COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut des achats de marchandises
COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut des ventes de marchandises
COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut des achats de services
COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut des ventes de services
COMPTA_VAT_ACCOUNT=Code comptable par défaut de la TVA collectée
COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut de la TVA déductible
COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients
COMPTA_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs

1
htdocs/langs/fr_FR/main.lang
View File

@ -661,6 +661,7 @@ Access=Accès
HelpCopyToClipboard=Utilisez Ctrl+C pour copier dans le presse-papier
SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "<strong>%s</strong>" (sinon "%s")
OriginFileName=nom du fichier source
SetDemandReason=Définir l'origine
# Week day
Monday=Lundi

2
htdocs/langs/fr_FR/other.lang
View File

@ -138,10 +138,12 @@ StatsByNumberOfEntities=Statistiques en nombre d'entités référentes
NumberOfProposals=Nombre de propositions commerciales sur les 12 derniers mois
NumberOfCustomerOrders=Nombre de commandes clients sur les 12 derniers mois
NumberOfCustomerInvoices=Nombre de factures clients sur les 12 derniers mois
NumberOfSupplierOrders=Nombre de commandes fournisseurs sur les 12 derniers mois
NumberOfSupplierInvoices=Nombre de factures fournisseurs sur les 12 derniers mois
NumberOfUnitsProposals=Nombre d'unités sur les propositions commerciales des 12 derniers mois
NumberOfUnitsCustomerOrders=Nombre d'unités sur les commandes clients des 12 derniers mois
NumberOfUnitsCustomerInvoices=Nombre d'unités sur les factures clients des 12 derniers mois
NumberOfUnitsSupplierOrders=Nombre d'unités sur les commandes fournisseur des 12 derniers mois
NumberOfUnitsSupplierInvoices=Nombre d'unités sur les factures fournisseurs des 12 derniers mois
EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
EMailTextInvoiceValidated=La facture %s vous concernant a été validée.

4
htdocs/langs/it_IT/contracts.lang
View File

@ -86,9 +86,9 @@ ExpiredSince=Scaduto il
RelatedContracts=Contratti relativi
NoExpiredServices=Non ci sono servizi scaduti attivi
ListOfServicesToExpireWithDuration=Lista di servizi in scadenza entro %s giorni
# ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
ListOfServicesToExpireWithDurationNeg=Lista di servizi scaduti da più di %s giorni
ListOfServicesToExpire=Lista dei servizi in scadenza
# NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali.
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto

32
htdocs/langs/it_IT/cron.lang
View File

@ -17,19 +17,19 @@ Permission23104 = Esegui compito programmato
#
# Admin
#
# CronSetup= Scheduled job management setup
CronSetup= Impostazione delle azioni pianificate
URLToLaunchCronJobs=URL che lancia i job di cron
OrToLaunchASpecificJob=O per lanciare un job specifico
KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
# FileToLaunchCronJobs=Command line to launch cron jobs
# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
FileToLaunchCronJobs=Comando per lanciare i job di cron
CronExplainHowToRunUnix=In ambienti Unix dovresti usare crontab per lanciare il comando ogni minuto
CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows dovresti usare Operazioni Pianificate per lanciare il comando ogni minuto
#
# Menu
#
# CronJobs=Scheduled jobs
CronJobs=Azioni pianificate
CronListActive= Lista dei job attivi
CronListInactive= Lista dei job disabilitati
@ -44,12 +44,12 @@ CronListOfCronJobs=Lista dei job programmati
CronCommand=Comando
CronList= Lista dei job
CronDelete= Cancella job di cron
# CronConfirmDelete= Are you sure you want to delete this cron job ?
# CronExecute=Launch job
CronConfirmDelete= Vuoi davvero cancellare questa azione pianificata?
CronExecute=Esegui azione
CronConfirmExecute= Sei sicuro di voler eseguire ora questo job
CronInfo= I job possono eseguire compiti pianificati
CronWaitingJobs=Job in attesa
# CronTask=Job
CronTask=Azione
CronNone= Nessuno
CronDtStart=Data di inizio
CronDtEnd=Data di fine
@ -67,8 +67,8 @@ CronNoJobs=Nessun job registrato
CronPriority=Priorità
CronLabel=Descrizione
CronNbRun=Num. lancio
# CronEach=Every
# JobFinished=Job launched and finished
CronEach=Ogni
JobFinished=Azione eseguita e completata
#
#Page card
@ -82,17 +82,17 @@ CronSaveSucess=Salvato con successo
CronNote=Commento
CronFieldMandatory=Il campo %s è obbligatorio
CronErrEndDateStartDt=La data di fine non può essere precedente a quella di inizio
# CronStatusActiveBtn=Enable
CronStatusActiveBtn=Abilita
CronStatusInactiveBtn=Disattiva
# CronTaskInactive=This job is disabled
CronTaskInactive=Questa azione è disabilitata
CronDtLastResult=Data dell'ultimo risultato
CronId=Id
# CronClassFile=Classes (filename.class.php)
CronClassFile=Classi (filename.class.php)
CronModuleHelp=Nome della directory del modulo di Dolibarr (funziona anche con moduli di Dolibarr esterni). <BR> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/<u>product</u>/class/product.class.php, il valore da inserire è <i>product</i>
CronClassFileHelp=Nome del file da caricare.<BR> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore del class file name è <i>product.class.php</i>
CronObjectHelp=Nome dell'oggetto da caricare. <BR>Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>Product</i>
# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
CronMethodHelp=Nome del metodo dell'oggetto da eseguire. <BR>Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>fetch</i>
CronArgsHelp=Argomenti del metodo.<br/> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore dei parametri può essere <i>0, ProductRef</i>
CronCommandHelp=Il comando da eseguire sul sistema
#
@ -110,4 +110,4 @@ CronType_command=Comando da shell
CronMenu=Cron
CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate.

54
htdocs/langs/it_IT/holiday.lang
View File

@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - holiday
# HRM=HRM
HRM=HRM
Holidays=Ferie
CPTitreMenu=Ferie
# MenuReportMonth=Monthly statement
MenuReportMonth=Estratto conto mensile
MenuAddCP=Richiedi ferie
NotActiveModCP=Per vedere questa pagina devi attivare il modulo ferie.
NotConfigModCP=Per vedere questa pagina devi configurare il modulo ferie. <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> Clicca qui </ a> per attivarlo.
@ -24,16 +24,16 @@ ReviewedByCP=Sarà valutato da
DescCP=Descrizione
SendRequestCP=Genero richiesta ferie
DelayToRequestCP=Le richieste di ferie devono essere inoltrate almeno <b>%s giorni</b> prima.
# MenuConfCP=Edit balance of holidays
MenuConfCP=Modifica ferie rimanenti
UpdateAllCP=Aggiorna le ferie
# SoldeCPUser=Holidays balance is <b>%s</b> days.
SoldeCPUser=Rimangono <b>%s</b> giorni di ferie
ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio.
ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione:
ErrorIDFicheCP=Si è verificato un errore, la richiesta di ferie non esiste.
ReturnCP=Torna alla pagina precedente
ErrorUserViewCP=Non sei autorizzato a leggere questa richiesta di ferie.
# InfosCP=Information of the demand of holidays
# InfosWorkflowCP=Information Workflow
InfosCP=Informazioni sulla richiesta ferie
InfosWorkflowCP=Flusso di informazioni
DateCreateCP=Data di creazione
RequestByCP=Richiesto da
TitreRequestCP=Scheda ferie
@ -74,9 +74,9 @@ MotifCP=Motivo
UserCP=Utente
ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario.
AddEventToUserOkCP=Permesso straordinario assegnato correttamente.
# MenuLogCP=View logs of holidays
# LogCP=Log of updates of holidays
# ActionByCP=Performed by
MenuLogCP=Vedi lo storico ferie
LogCP=Log degli aggiornamenti ferie
ActionByCP=Eseguito da
UserUpdateCP=Per l'utente
PrevSoldeCP=Saldo precedente
NewSoldeCP=Nuovo saldo
@ -87,7 +87,7 @@ FirstDayOfHoliday=Primo giorno di ferie
LastDayOfHoliday=Ultimo giorno di ferie
HolidaysMonthlyUpdate=Aggiornamento mensile
ManualUpdate=Aggiornamento manuale
# HolidaysCancelation=Holidays cancelation
HolidaysCancelation=Cancellazione ferie
## Configuration du Module ##
ConfCP=Configurazione del modulo ferie
@ -98,18 +98,18 @@ ConfirmConfigCP=Convalida la configurazione
LastUpdateCP=Ultimo aggiornamento automatico delle ferie
UpdateConfCPOK=Aggiornato con successo
ErrorUpdateConfCP=Si è verificato un errore nell'aggiornamento, riprovare.
# AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
AddCPforUsers=Aggiornare le ferie residue dell'utente <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">facendo click qui</a>.
DelayForSubmitCP=Scadenza per l'inoltro di richieste ferie
# AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
# AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
# AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
# nbUserCP=Number of users supported in the module holidays
# nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
AlertapprobatortorDelayCP=Impedisci l'approvazione delle ferie se la richiesta non corrisponde alla deadline
AlertValidatorDelayCP=Impedisci l'approvazione se la richiesta ferie eccede il ritardo massimo
AlertValidorSoldeCP=Impedisci l'apporvazione ferie se la richiesta eccede la disponibilità residua
nbUserCP=Numero di utenti gestiti dal modulo ferie
nbHolidayDeductedCP=Numero di giorni di ferie da scalare per ogni giorno di ferie goduto
nbHolidayEveryMonthCP=Numero di giorni di ferie maturati al mese
Module27130Name= Gestione ferie
Module27130Desc= Gestione ferie
# TitleOptionMainCP=Main settings of holidays
# TitleOptionEventCP=Settings of holidays related to events
TitleOptionMainCP=Impostazioni principali della gestione ferie
TitleOptionEventCP=Impostazioni per le ferie relative ad eventi
ValidEventCP=Convalida
UpdateEventCP=Aggiorna eventi
CreateEventCP=Crea
@ -129,14 +129,14 @@ UpdateEventOptionCP=Aggiorna
ErrorMailNotSend=Si è verificato un errore nell'invio dell'email:
NoCPforMonth=Nessun permesso questo mese.
nbJours=Numero di giorni
# TitleAdminCP=Configuration of Holidays
TitleAdminCP=Impostazioni delle ferie
#Messages
Hello=Salve
HolidaysToValidate=Convalida ferie
# HolidaysToValidateBody=Below is a request for holidays to validate
# HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
# HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
HolidaysToValidateBody=Di sotto una richiesta ferie da verificare
HolidaysToValidateDelay=Questa è una richiesta di ferie da godere fra meno di %s giorni
HolidaysToValidateAlertSolde=L'utente che ha fatto questa richiesta ferie non dispone di abbastanza ferie residue
HolidaysValidated=Ferie convalidate
HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata convalidata.
HolidaysRefused=Ferie negate
@ -144,9 +144,9 @@ HolidaysRefusedBody=La tua richiesta di ferie dal %s al %s è stata negata con l
HolidaysCanceled=Ferie annullate
HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata annullata.
# Permission20001=Read/create/modify their holidays
# Permission20002=Read/modify all requests of holidays
# Permission20003=Delete their holidays requests
# Permission20004=Define users holidays
# Permission20005=Review log of modified holidays
Permission20001=Leggi/crea/modifica le loro ferie
Permission20002=Leggi/modifica tutte le richieste di ferie
Permission20003=Cancella le loro richieste di ferie
Permission20004=Definisci le ferie degli utenti
Permission20005=Controlla il log delle modifiche alle ferie
Permission20006=Accedi al report mensile delle ferie

18
htdocs/langs/it_IT/languages.lang
View File

@ -4,7 +4,7 @@ Language_ar_AR=Arabo
Language_ar_SA=Arabo
Language_bg_BG=Bulgaro
Language_ca_ES=Catalano
# Language_cs_CZ=Czech
Language_cs_CZ=Ceco
Language_da_DA=Danese
Language_da_DK=Danese
Language_de_DE=Tedesco
@ -16,13 +16,13 @@ Language_en_IN=Inglese (India)
Language_en_NZ=Inglese (Nuova Zelanda)
Language_en_SA=Inglese (Arabia Saudita)
Language_en_US=Inglese (Stati Uniti)
# Language_en_ZA=English (South Africa)
Language_en_ZA=Inglese (Sud Africa)
Language_es_ES=Spagnolo
Language_es_AR=Spagnolo (Argentina)
Language_es_HN=Spagnolo (Honduras)
Language_es_MX=Spagnolo (Messico)
# Language_es_PY=Spanish (Paraguay)
# Language_es_PE=Spanish (Peru)
Language_es_PY=Spagnolo (Paraguay)
Language_es_PE=Spagnolo (Perù)
Language_es_PR=Spagnolo (Portorico)
Language_et_EE=Estone
Language_fa_IR=Persiano
@ -31,14 +31,14 @@ Language_fr_BE=Francese (Belgio)
Language_fr_CA=Francese (Canada)
Language_fr_CH=Francese (Svizzera)
Language_fr_FR=Francese
# Language_fr_NC=French (New Caledonia)
Language_fr_NC=Francese (Nuova Caledonia)
Language_he_IL=Ebraico
Language_hu_HU=Ungherese
Language_is_IS=Islandese
Language_it_IT=Italiano
Language_ja_JP=Giapponese
# Language_ko_KR=Korean
# Language_lv_LV=Latvian
Language_ko_KR=Coreano
Language_lv_LV=Lettone
Language_nb_NO=Norvegese (Bokmål)
Language_nl_BE=Olandese (Belgio)
Language_nl_NL=Olandese (Paesi Bassi)
@ -52,7 +52,7 @@ Language_tr_TR=Turco
Language_sl_SI=Sloveno
Language_sv_SV=Svedese
Language_sv_SE=Svedese
# Language_sk_SK=Slovakian
# Language_vi_VN=Vietnamese
Language_sk_SK=Slovacco
Language_vi_VN=Vietnamita
Language_zh_CN=Cinese
Language_zh_TW=Cinese (Tradizionale)

2
htdocs/langs/it_IT/mailmanspip.lang
View File

@ -10,7 +10,7 @@ SynchroSpipEnabled=SPIP verrà aggiornato
DescADHERENT_MAILMAN_ADMINPW=Password di amministrazione di Mailman
DescADHERENT_MAILMAN_URL=URL per l'iscrizione a Mailman
DescADHERENT_MAILMAN_UNSUB_URL=URL per la disiscrizione da Mailman
# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
DescADHERENT_MAILMAN_LISTS=Lista(e) a cui iscrivere automaticamente i nuovi membri (separate da virgola)
SPIPTitle=SPIP Content Management System
DescADHERENT_SPIP_SERVEUR=Server SPIP
DescADHERENT_SPIP_DB=Nome del database di SPIP

4
htdocs/langs/it_IT/members.lang
View File

@ -8,7 +8,7 @@ Members=Membri
MemberAccount=Account membro
ShowMember=Visualizza scheda membro
UserNotLinkedToMember=L'utente non è collegato ad un membro
# ThirdpartyNotLinkedToMember=Third-party not linked to a member
ThirdpartyNotLinkedToMember=Nessun soggetto terzo associato a questo membro
MembersTickets=Biglietti membri
FundationMembers=Membri della fondazione
Attributs=Attributi
@ -200,5 +200,5 @@ ByProperties=Per natura
MembersStatisticsByProperties=Statistiche dei membri per natura
MembersByNature=Membri per natura
VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
# NoVatOnSubscription=No TVA for subscriptions
NoVatOnSubscription=Nessuna IVA per gli abbonamenti
MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione

2
htdocs/langs/it_IT/opensurvey.lang
View File

@ -14,7 +14,7 @@ OpenSurveyYourEMail=Il tuo indirizzo email
VotersCanModify=I votanti possono modificare il voto degli altri
ToReceiveEMailForEachVote=Per ricevere un'email per ogni voto
TypeDate=Digita data
# TypeClassic=Type standard
TypeClassic=Tipo standard
YouAreInPollCreateArea=Sei nella sezione di creazione sondaggi
FieldMandatory=Campo obbligatorio
OpenSurveyDesc=Servizio online per pianificare incontri o fare indagini velocemente e con facilità.

70
htdocs/langs/it_IT/products.lang
View File

@ -76,7 +76,7 @@ ContractStatusToRun=Da avviare
ContractNotRunning=Il presente contratto non è attivo
ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
# ErrorProductClone=There was a problem while trying to clone the product or service.
ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio
Suppliers=Fornitori
SupplierRef=Rif. fornitore
ShowProduct=Visualizza prodotto
@ -112,8 +112,8 @@ AssociatedProductsAbility=Attiva i prodotti associati
AssociatedProducts=Prodotti associati
AssociatedProductsNumber=Numero di prodotti associati
ParentProductsNumber=Numero del prodotto padre
# IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
# IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale
IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale
EditAssociate=Modifica associazione
Translation=Traduzione
KeywordFilter=Filtro per parola chiave
@ -142,11 +142,11 @@ NoStockForThisProduct=Nessuna scorta per questo prodotto
NoStock=Nessuna scorta
Restock=Rimpingua scorta
ProductSpecial=Prodotto speciale
# QtyMin=Minimum Qty
QtyMin=Quantità minima
PriceQty=Prezzo per tale quantitativo
# PriceQtyMin=Price for this min. qty (w/o discount)
# VATRateForSupplierProduct=VAT Rate (for this supplier/product)
# DiscountQtyMin=Default discount for qty
PriceQtyMin=Prezzo per questa quantità minima (senza sconti)
VATRateForSupplierProduct=Aliquota IVA (per questo prodotto)
DiscountQtyMin=Sconto automatico per la quantità
NoPriceDefinedForThisSupplier=Nessun prezzo/quantità definito per questo fornitore/prodotto
NoSupplierPriceDefinedForThisProduct=Nessun prezzo fornitore definito per questo prodotto
RecordedProducts=Prodotti registrati
@ -164,7 +164,7 @@ CloneProduct=Clona prodotto/servizio
ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio <b>%s</b>?
CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
ClonePricesProduct=Clona principali informazioni e prezzi
# CloneCompositionProduct=Clone product/service composition
CloneCompositionProduct=Duplica la composizione del prodotto/servizio
ProductIsUsed=Questo prodotto è in uso
NewRefForClone=Rif. del nuovo prodotto/servizio
CustomerPrices=Prezzi al cliente
@ -173,34 +173,34 @@ CustomCode=Codice dogana
CountryOrigin=Paese di origine
HiddenIntoCombo=Nascosti nelle tendine di selezione
Nature=Natura
# ProductCodeModel=Product code template
# ServiceCodeModel=Service code template
# AddThisProductCard=Create product card
# HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
# AddThisServiceCard=Create service card
# HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
# CurrentProductPrice=Current price
# AlwaysUseNewPrice=Always use current price of product/service
# AlwaysUseFixedPrice=Use the fixed price
# PriceByQuantity=Price by quantity
# PriceByQuantityRange=Quantity range
# ProductsDashboard=Products/Services summary
# UpdateOriginalProductLabel=Modify original label
ProductCodeModel=Template per il codice prodotto
ServiceCodeModel=Template per il codice servizio
AddThisProductCard=Crea scheda prodotto
HelpAddThisProductCard=Questa opzione permette la creazione o la clonazione di un prodotto se non esiste.
AddThisServiceCard=Crea scheda servizio
HelpAddThisServiceCard=Questa opzione permette la creazione o la clonazione di un servizio se non esiste.
CurrentProductPrice=Prezzo corrente
AlwaysUseNewPrice=Usa sempre il prezzo corrente di un prodotto/servizio
AlwaysUseFixedPrice=Usa prezzo non negoziabile
PriceByQuantity=Prezzo per quantità
PriceByQuantityRange=Intervallo della quantità
ProductsDashboard=Riepilogo prodotti/servizi
UpdateOriginalProductLabel=Modifica l'etichetta originale
HelpUpdateOriginalProductLabel=Permette di modificare il nome del prodotto
### composition fabrication
# Building=Production and items dispatchment
# Build=Produce
# BuildIt=Produce & Dispatch
# BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
Building=Produzione e invio degli oggetti
Build=Produci
BuildIt=Produci & Invia
BuildindListInfo=Disponibilità residua per magaziino di produzione (inserire 0 per nessuna azione)
QtyNeed=Quantità
# UnitPmp=Net unit VWAP
# CostPmpHT=Net total VWAP
# ProductUsedForBuild=Auto consumed by production
UnitPmp=Unità netta VWAP
CostPmpHT=Totale netto VWAP
ProductUsedForBuild=Autoconsumato dalla produzione
ProductBuilded=Produzione completata
# ProductsMultiPrice=Product multi-price
# ProductSellByQuarterHT=Products turnover quarterly VWAP
# ServiceSellByQuarterHT=Services turnover quarterly VWAP
# Quarter1=1st. Quarter
# Quarter2=2nd. Quarter
# Quarter3=3rd. Quarter
# Quarter4=4th. Quarter
ProductsMultiPrice=Prodotto con più prezzi
ProductSellByQuarterHT=Turnover dei prodotti trimestrale VWAP
ServiceSellByQuarterHT=Turnover trimestrale dei servizi VWAP
Quarter1=Primo trimestre
Quarter2=Secondo trimestre
Quarter3=Terzo trimestre
Quarter4=Quarto trimestre

4
htdocs/langs/it_IT/propal.lang
View File

@ -70,8 +70,8 @@ ErrorPropalNotFound=Proposta %s non trovata
Estimate=Stima:
EstimateShort=Stima
OtherPropals=Altre proposte
# AddToDraftProposals=Add to draft proposal
# NoDraftProposals=No draft proposals
AddToDraftProposals=Aggiungi una bozza di proposta
NoDraftProposals=Nessuna bozza di proposta
CopyPropalFrom=Crea proposta commerciale da copia esistente
CreateEmptyPropal=Crea proposta commerciale vuota o dalla lista dei prodotti / servizi
DefaultProposalDurationValidity=Durata di validità predefinita per proposta commerciale (in giorni)

2
htdocs/langs/it_IT/suppliers.lang
View File

@ -37,4 +37,4 @@ AddSupplierOrder=Crea ordine fornitore
AddSupplierInvoice=Crea fattura fornitore
ListOfSupplierProductForSupplier=Elenco prodotti e prezzi per il fornitore <b>%s</b>
NoneOrBatchFileNeverRan=Nessuno batch file o <b>%s</b> non eseguito di recente
# SentToSuppliers=Sent to suppliers
SentToSuppliers=Inviato ai fornitori

6
htdocs/langs/it_IT/users.lang
View File

@ -113,8 +113,8 @@ YourRole=Il tuo ruolo
YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi!
NbOfUsers=Numero di utenti
DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
# HierarchicalResponsible=Hierarchical responsible
HierarchicalResponsible=Responsabile gerarchico
HierarchicView=Vista gerarchica
UseTypeFieldToChange=cambia usando il campo Tipo
# OpenIDURL=OpenID URL
# LoginUsingOpenID=Use OpenID to login
OpenIDURL=URL OpenID
LoginUsingOpenID=URL OpenID per il login

4
htdocs/langs/it_IT/workflow.lang
View File

@ -7,5 +7,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla convalida del contratto
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla chiusura dell'ordine cliente
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica la proposta commerciale collegata come fatturare quando l'ordine cliente è impostato come pagato
# descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
# descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti da fatturare quando la fattura viene impostata come pagata
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti da fatturare quando la fattura è validata

24
htdocs/langs/lv_LV/admin.lang
View File

@ -18,7 +18,7 @@ LockNewSessions=Lock jaunus sakarus
ConfirmLockNewSessions=Vai jūs tiešām vēlaties, lai ierobežotu jebkuru jaunu Dolibarr savienojumu ar sevi. Tikai lietotājs <b>%s</b> varēs pieslēgties pēc tam.
UnlockNewSessions=Noņemt savienojuma atslēga
YourSession=Jūsu sesija
Sessions=Lietotāji sesija
Sessions=Lietotāju sesija
WebUserGroup=Web serveris lietotāju / grupu
NoSessionFound=Jūsu PHP, šķiet, neļauj uzskaitīt aktīvās sesijas. Directory izmanto, lai saglabātu sesijas <b>(%s)</b> var būt aizsargāta (piemēram, pēc OS atļaujas vai PHP direktīvu open_basedir).
HTMLCharset=Charset par rada HTML lapas
@ -76,7 +76,7 @@ NextValueForReplacements=Tālāk vērtība (nomaiņa)
MustBeLowerThanPHPLimit=Piezīme: jūsu PHP ierobežo katra failu augšupielādes lielumu, lai <b>%s</b> %s, neatkarīgi no šī parametra vērtība ir
NoMaxSizeByPHPLimit=Piezīme: Nav limits tiek noteikts jūsu PHP konfigurācijā
MaxSizeForUploadedFiles=Maksimālais izmērs augšupielādēto failu (0 nepieļaut jebkādu upload)
UseCaptchaCode=Izmantot grafisko kodu (CAPTCHA) uz pieteikšanās lapu
UseCaptchaCode=Izmantot grafisko kodu (CAPTCHA) pieteikšanās lapā
UseAvToScanUploadedFiles=Izmantot anti-virus, lai skenētu augšupielādēto failu
AntiVirusCommand= Pilns ceļš pretvīrusu komandu
AntiVirusCommandExample= Piemērs ClamWin: C: \\ PROGRA 1 ~ \\ ClamWin \\ bin \\ clamscan.exe <br> Piemērs ClamAV: / usr / bin / clamscan
@ -124,7 +124,7 @@ YouCanEditPHPTZ=Noteikt atšķirīgu PHP laika joslu (nav obligāti), jūs varat
OSEnv=OS Vide
Box=Kaste
Boxes=Kastes
MaxNbOfLinesForBoxes=Maksimālais skaits līniju kastes
MaxNbOfLinesForBoxes=Maksimālais attēloto ierakstu skaits
PositionByDefault=Noklusējuma, lai
Position=Rīkojums
MenusDesc=Izvēlnes vadītāji nosaka saturu 2 izvēlnes bāros (horizontāla josla un vertikāla josla).
@ -148,7 +148,7 @@ PurgeAuditEvents=Iztīrīšana visus drošības pasākumus
ConfirmPurgeAuditEvents=Vai jūs tiešām vēlaties, lai iztīrītu visus drošības pasākumus? Visi drošības žurnāli tiks dzēsti, nekādi citi dati tiks noņemts.
NewBackup=Jauna rezerves kopija
GenerateBackup=Izveidot rezerves
Backup=Backup
Backup=Rezerves kopija
Restore=Atjaunot
RunCommandSummary=Rezerves ir uzsākta ar šādu komandu
RunCommandSummaryToLaunch=Rezerves var tikt uzsākta ar šādu komandu
@ -197,8 +197,8 @@ ModulesInterfaceDesc=Dolibarr moduļi saskarne ļauj jums pievienot funkcijas at
ModulesSpecialDesc=Īpašas programmas ir ļoti specifiskas un reti izmanto moduļus.
ModulesJobDesc=Biznesa moduļi nodrošina vienkāršu iepriekš iestatīšanu Dolibarr par konkrēto darbību.
ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļus, lai lejupielādētu uz ārējām tīmekļa vietnēm internetā ...
ModulesMarketPlaces=Vairāk moduļi ...
DoliStoreDesc=DoliStore, oficiālais tirgus vieta Dolibarr ERP / CRM ārējiem moduļiem
ModulesMarketPlaces=Papildus moduļi ...
DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
WebSiteDesc=Tīmekļa vietnes pakalpojumu sniedzēji, jūs varat meklēt, lai atrastu jaunus moduļus ...
URL=Saite
BoxesAvailable=Kastes pieejamās
@ -213,7 +213,7 @@ Required=Nepieciešams
Security=Drošība
Passwords=Paroles
DoNotStoreClearPassword=Vai nav veikals skaidri paroles datu bāzē, bet veikalā tikai šifrēta vērtība (aktivētā ieteicams)
MainDbPasswordFileConfEncrypted=Datu bāzes paroli šifrēti conf.php (aktivētā ieteicams)
MainDbPasswordFileConfEncrypted=Datubāzes paroli šifrēti conf.php (aktivēt ieteicams)
InstrucToEncodePass=Lai iegūtu paroli, iekodētas <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = &quot;...&quot;</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = &quot;crypted: %s&quot;</b>
InstrucToClearPass=Lai iegūtu paroli, dekodēt (skaidri) uz <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = &quot;crypted: ...&quot;</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
ProtectAndEncryptPdfFiles=Aizsardzību radīto PDF failus (aktivētā nav ieteicama, pārtraukumiem masveida pdf paaudze)
@ -448,7 +448,7 @@ Module250Name=Datu imports
Module250Desc=Instruments, lai importētu datas Dolibarr (ar palīgiem)
Module310Name=Dalībnieki
Module310Desc=Fonds biedri vadība
Module320Name=RSS Feed
Module320Name=RSS barotne
Module320Desc=Pievienot RSS plūsmu iekšā Dolibarr ekrāna lapām
Module330Name=Grāmatzīmes
Module330Desc=Grāmatzīmi pārvaldības
@ -841,7 +841,7 @@ DefaultMenuManager= Standarta izvēlne vadītājs
DefaultMenuSmartphoneManager=Viedtālrunis izvēlne vadītājs
Skin=Skin tēma
DefaultSkin=Default skin tēma
MaxSizeList=Maksimālais garums sarakstu
MaxSizeList=Maksimālais saraksta garums
DefaultMaxSizeList=Noklusējuma max garums sarakstu
MessageOfDay=Ziņu par to dienā
MessageLogin=Login lapu īsziņu
@ -924,7 +924,7 @@ OnceSetupFinishedCreateUsers=Uzmanību, jums ir Dolibarr administrators lietotā
MiscellaneousDesc=Definēt šeit visus citus parametrus, kas saistīti ar drošību.
LimitsSetup=Ierobežojumi / Precision iestatīšanas
LimitsDesc=Jūs varat noteikt limitus, precizējumus un optimizācijas, kas izmantotas ar Dolibarr šeit
MAIN_MAX_DECIMALS_UNIT=Max aiz komata par vienības cenu
MAIN_MAX_DECIMALS_UNIT=Maksimālais ciparu skaits aiz komata cenām
MAIN_MAX_DECIMALS_TOT=Max decimāldaļas attiecībā uz kopējo cenu
MAIN_MAX_DECIMALS_SHOWN=Max aiz komata par cenām parādīta ekrānā (Add <b>...</b> pēc šo numuru, ja jūs vēlaties redzēt <b>...</b> kad numurs tiek apcirsti, kad redzams uz ekrāna)
MAIN_DISABLE_PDF_COMPRESSION=Izmantot PDF saspiešanu radīto PDF failus.
@ -1308,8 +1308,8 @@ UseBarcodeInProductModule=Izmantot svītrkodus produktiem
CodeBarGenerator=Svītrkodu ģenerators
ChooseABarCode=Nav noteikts ģenerators
FormatNotSupportedByGenerator=Format not supported by this generator
BarcodeDescEAN8=Svītrkods EAN8 tipu
BarcodeDescEAN13=Svītrkods EAN13 tipu
BarcodeDescEAN8=Svītrkods EAN8 veids
BarcodeDescEAN13=Svītrkods EAN13 veida
BarcodeDescUPC=Svītrkoda tipa UPC
BarcodeDescISBN=Svītrkoda tipa ISBN
BarcodeDescC39=Svītrkods C39 tipu

30
htdocs/langs/lv_LV/bills.lang
View File

@ -1,10 +1,10 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Pavadzīme
Bills=Rēķini
BillsCustomers=Klienta rēķini
Bills=Pavadzīmes
BillsCustomers=Klientu rēķini
BillsCustomer=Klienta rēķins
BillsSuppliers=Piegādātāja rēķinus
BillsCustomersUnpaid=Bezalgas klienta rēķini
BillsSuppliers=Piegādātāja rēķins
BillsCustomersUnpaid=Neapmaksāti klienta rēķini
BillsCustomersUnpaidForCompany=Bezalgas klienta rēķinus %s
BillsSuppliersUnpaid=Bezalgas piegādātāja rēķinus
BillsSuppliersUnpaidForCompany=Bezalgas piegādātāja rēķinus %s
@ -77,8 +77,8 @@ PaymentAmount=Maksājuma summa
ValidatePayment=Apstiprināt maksājumu
PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājumu samaksāt
HelpPaymentHigherThanReminderToPay= Uzmanība, maksājuma summu, no vienas vai vairākām rēķinus, ir lielāks nekā pārējās maksāt. <br> Labot savu ierakstu, citādi apstiprināt un domāt par izveidot kredīta piezīmi par pārsnieguma saņem par katru pārmaksāto rēķiniem.
ClassifyPaid=Klasificēt &quot;Maksas&quot;
ClassifyPaidPartially=Klasificēt &quot;Maksas daļēji&quot;
ClassifyPaid=Klasificēt &quot;Apmaksāts&quot;
ClassifyPaidPartially=Klasificēt &quot;Apmaksāts daļēji&quot;
ClassifyCanceled=Klasificēt &quot;Abandoned&quot;
ClassifyClosed=Klasificēt &quot;Slēgts&quot;
CreateBill=Izveidot rēķinu
@ -99,7 +99,7 @@ Amount=Summa
PriceBase=Cena bāze
BillStatus=Rēķina statuss
BillStatusDraft=Projekts (ir jāapstiprina)
BillStatusPaid=Apmaksātais
BillStatusPaid=Apmaksāts
BillStatusPaidBackOrConverted=Samaksāta vai pārvērsti atlaidi
BillStatusConverted=Apmaksātais (gatavas pēdējo rēķinu)
BillStatusCanceled=Pamests
@ -115,7 +115,7 @@ BillShortStatusConverted=Apstrādāti
BillShortStatusCanceled=Pamests
BillShortStatusValidated=Validēta
BillShortStatusStarted=Sākās
BillShortStatusNotPaid=Nav samaksāta
BillShortStatusNotPaid=Nav samaksāts
BillShortStatusClosedUnpaid=Slēgts
BillShortStatusClosedPaidPartially=Samaksāts (daļēji)
PaymentStatusToValidShort=Lai apstiprinātu
@ -171,7 +171,7 @@ ValidateBill=Apstiprināt rēķinu
UnvalidateBill=Unvalidate rēķinu
NumberOfBills=Nb rēķinu
NumberOfBillsByMonth=Nb rēķinu pa mēnešiem
AmountOfBills=Summa rēķinu
AmountOfBills=Rēķinu summa
AmountOfBillsByMonthHT=Summa rēķinus mēnesī (neto pēc nodokļiem)
ShowSocialContribution=Rādīt sociālās iemaksas
ShowBill=Rādīt rēķinu
@ -209,7 +209,7 @@ MenuToValid=Lai derīgs
DateMaxPayment=Maksājums jāveic līdz
DateEcheance=Izpildes datums robeža
DateInvoice=Rēķina datums
NoInvoice=Nevienu rēķinu
NoInvoice=Nav rēķinu
ClassifyBill=Klasificēt rēķinu
NoSupplierBillsUnpaid=Nav piegādātājiem rēķini neapmaksātie
SupplierBillsToPay=Piegādātāji rēķinus apmaksāt
@ -260,7 +260,7 @@ AbsoluteDiscountUse=Šis kredīta veids var izmantot rēķinā pirms tās apstip
CreditNoteDepositUse=Rēķins ir jāapstiprina, lai izmantotu šo ķēniņu kredītu
NewGlobalDiscount=Jauns absolūtais atlaide
NewRelativeDiscount=Jauns relatīvais atlaide
NoteReason=Piezīme / Pamatojums
NoteReason=Piezīme / Iemesls
ReasonDiscount=Iemesls
DiscountOfferedBy=Piešķir
DiscountStillRemaining=Atlaides vēl atlikušie
@ -319,12 +319,12 @@ PaymentTypeVIR=Banku noguldījumu
PaymentTypeShortVIR=Banku noguldījumu
PaymentTypePRE=Bankas rīkojums
PaymentTypeShortPRE=Bankas rīkojums
PaymentTypeLIQ=Nauda
PaymentTypeShortLIQ=Nauda
PaymentTypeLIQ=Skaidra nauda
PaymentTypeShortLIQ=Skaidra nauda
PaymentTypeCB=Kredītkarte
PaymentTypeShortCB=Kredītkarte
PaymentTypeCHQ=Pārbaude
PaymentTypeShortCHQ=Pārbaude
PaymentTypeCHQ=Čeks
PaymentTypeShortCHQ=Čeks
PaymentTypeTIP=TIP
PaymentTypeShortTIP=TIP
PaymentTypeVAD=Tiešsaistes maksājumu

2
htdocs/langs/lv_LV/boxes.lang
View File

@ -3,7 +3,7 @@ BoxLastRssInfos=RSS informācija
BoxLastProducts=Pēdējie %s produkti / pakalpojumi
BoxProductsAlertStock=Produkti pārdošanā brīdinājumu
BoxLastProductsInContract=Pēdējās %s līgumi produktu / pakalpojumu
BoxLastSupplierBills=Pagājušā piegādātāja rēķinus
BoxLastSupplierBills=Pēdējais piegādātāja rēķins
BoxLastCustomerBills=Pagājušā klienta rēķini
BoxOldestUnpaidCustomerBills=Vecākās bezalgas klienta rēķini
BoxOldestUnpaidSupplierBills=Vecākās bezalgas piegādātāja rēķinus

74
htdocs/langs/lv_LV/companies.lang
View File

@ -197,7 +197,7 @@ ProfId3MX=Prof Id 3 (Profesional Harta)
ProfId4MX=-
ProfId5MX=-
ProfId6MX=-
ProfId1NL=KVK nummer
ProfId1NL=KVK nummurs
ProfId2NL=-
ProfId3NL=-
ProfId4NL=Burgerservicenummer (BSN)
@ -236,32 +236,32 @@ ProspectCustomer=Prospect / Klients
Prospect=Perspektīva
CustomerCard=Klienta karte
Customer=Klients
CustomerDiscount=Klientu Atlaide
CustomerRelativeDiscount=Relatīvais klientu atlaide
CustomerAbsoluteDiscount=Absolute klientu atlaide
CustomerRelativeDiscountShort=Relatīvais atlaide
CustomerAbsoluteDiscountShort=Absolute atlaide
CompanyHasRelativeDiscount=Šis klients ir noklusējuma atlaidi <b>%s%%</b>
CustomerDiscount=Klienta Atlaide
CustomerRelativeDiscount=Relatīvā klienta atlaide
CustomerAbsoluteDiscount=Absolūtā klienta atlaide
CustomerRelativeDiscountShort=Relatīvā atlaide
CustomerAbsoluteDiscountShort=Absolūtā atlaide
CompanyHasRelativeDiscount=Šim klientam ir pastāvīgā atlaide <b>%s%%</b>
CompanyHasNoRelativeDiscount=Šis klients nav relatīvā atlaide pēc noklusējuma
CompanyHasAbsoluteDiscount=Šis klients vēl ir atlaides kredītus vai noguldījumus uz <b>%s</b> %s
CompanyHasCreditNote=Šis klients joprojām ir kredīta piezīmes <b>%s</b> %s
CompanyHasNoAbsoluteDiscount=Šis klients nav atlaižu kredīts pieejams
CustomerAbsoluteDiscountAllUsers=Absolūtais atlaides (ko piešķir visiem lietotājiem)
CustomerAbsoluteDiscountMy=Absolūtais atlaides (ko piešķir pats)
DefaultDiscount=Default atlaide
AvailableGlobalDiscounts=Absolute atlaides
DefaultDiscount=Noklusētā atlaide
AvailableGlobalDiscounts=Absolūtās pieejamās atlaides
DiscountNone=Neviens
Supplier=Piegādātājs
CompanyList=Kompānijas sarakstā
CompanyList=Kompāniju saraksts
AddContact=Pievienot kontaktu
AddContactAddress=Pievienot kontaktu / adrese
AddContactAddress=Pievienot kontakta / adresi
EditContact=Labot kontaktu
EditContactAddress=Labot kontakta / adresi
Contact=Sazināties
ContactsAddresses=Kontakti / adreses
Contact=Kontakts
ContactsAddresses=Kontaktu / adreses
NoContactDefinedForThirdParty=Nav kontakta definēts šīs trešās personas
NoContactDefined=Nav kontakta definēts
DefaultContact=Default kontakta / adrese
DefaultContact=Noklsētais kontakts / adrese
AddCompany=Pievienot uzņēmumu
AddThirdParty=Pievienot trešo pusi
DeleteACompany=Dzēst uzņēmumu
@ -277,7 +277,7 @@ RequiredIfCustomer=Nepieciešams, ja trešā puse ir klients vai izredzes
RequiredIfSupplier=Nepieciešams, ja trešā puse ir piegādātājs
ValidityControledByModule=Derīguma vadību kontrolēta ar moduli
ThisIsModuleRules=Tas ir noteikumi šajā modulī
LastProspect=Pēdējo reizi
LastProspect=Pēdējais
ProspectToContact=Prospect sazināties
CompanyDeleted=Kompānija &quot;%s&quot; svītro no datu bāzes.
ListOfContacts=Kontaktu saraksts / adresēm
@ -285,12 +285,12 @@ ListOfContactsAddresses=Kontaktu saraksts / adresses
ListOfProspectsContacts=Saraksts prospekta kontaktu
ListOfCustomersContacts=Saraksts klientu kontaktu
ListOfSuppliersContacts=Saraksts piegādātāju kontaktiem
ListOfCompanies=Uzņēmumu sarakstu
ListOfThirdParties=Saraksts ar trešajām personām
ListOfCompanies=Uzņēmumu saraksts
ListOfThirdParties=Trešo personu saraksts
ShowCompany=Rādīt uzņēmumu
ShowContact=Rādīt sazināties
ShowContact=Rādīt kontaktu
ContactsAllShort=Visi (Bez filtra)
ContactType=Sazinieties tipa
ContactType=Kontakta veids
ContactForOrders=Ordeņa kontakts
ContactForProposals=Priekšlikuma kontakts
ContactForContracts=Līgums kontaktpersona
@ -300,7 +300,7 @@ NoContactForAnyProposal=Šis kontakts ir ne kontaktu par jebkuru komerciālu pri
NoContactForAnyContract=Šis kontakts ir ne kontaktu par jebkuru līgumu
NoContactForAnyInvoice=Šis kontakts ir ne kontaktu par jebkuru rēķinu
NewContact=Jauns kontakts
NewContactAddress=Jauns kontakts / adrese
NewContactAddress=Jauna kontakta / adrese
LastContacts=Pēdējie kontakti
MyContacts=Mani kontakti
Phones=Telefoni
@ -309,11 +309,11 @@ CapitalOf=Capital %s
EditCompany=Labot uzņēmumu
EditDeliveryAddress=Rediģēt piegādes adresi
ThisUserIsNot=Šis lietotājs nav izredzes, klients ne piegādātājs
VATIntraCheck=Pārbaude
VATIntraCheck=Pārbaudīt
VATIntraCheckDesc=Saite <b>%s</b> ļauj lūgt Eiropas PVN pārbaudītājs pakalpojumu. Ārējo interneta pieslēgums no servera ir nepieciešams šo pakalpojumu, lai strādātu.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
VATIntraCheckableOnEUSite=Pārbaudiet Intracomunnautary PVN par Eiropas komisijā vietas
VATIntraManualCheck=Jūs varat arī pārbaudīt manuāli no eiropas mājas lapas <a href="%s" target="_blank">%s</a>
VATIntraManualCheck=Jūs varat pārbaudīt manuāli eiropas mājas lapā <a href="%s" target="_blank">%s</a>
ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
NorProspectNorCustomer=Tāpat arī izredzes, ne klientu
JuridicalStatus=Juridiskais statuss
@ -321,7 +321,7 @@ Staff=Personāls
ProspectLevelShort=Potenciāls
ProspectLevel=Prospect potenciālu
ContactPrivate=Privāts
ContactPublic=Dalīta
ContactPublic=Publisks
ContactVisibility=Redzamība
OthersNotLinkedToThirdParty=Citi, kas nav saistīts ar trešās puses
ProspectStatus=Prospect statuss
@ -342,13 +342,13 @@ TE_PRIVATE=Privātpersona
TE_OTHER=Cits
StatusProspect-1=Nesazināties
StatusProspect0=Nekad sazinājās
StatusProspect1=Lai sazinātos
StatusProspect2=Sazinieties procesā
StatusProspect1=Jāsazinās
StatusProspect2=Sazināšanās procesā
StatusProspect3=Sazināties darīts
ChangeDoNotContact=Mainīt statusu uz &quot;Vai nav sazināties ar&quot;
ChangeDoNotContact=Mainīt statusu uz &quot;Nesazināties&quot;
ChangeNeverContacted=Mainīt statusu uz &quot;Nekad sazinājies&quot;
ChangeToContact=Mainīt statusu uz &quot;Lai sazinātos&quot;
ChangeContactInProcess=Mainīt statusu uz &quot;Kontaktēties procesā&quot;
ChangeToContact=Mainīt statusu uz &quot;Jāsazinās&quot;
ChangeContactInProcess=Mainīt statusu uz &quot;Sazināšanās procesā&quot;
ChangeContactDone=Mainīt statusu uz &quot;Kontaktēties jādara&quot;
ProspectsByStatus=Perspektīvas pēc statusa
BillingContact=Norēķinu kontakts
@ -356,7 +356,7 @@ NbOfAttachedFiles=Pievienoto failu skaits
AttachANewFile=Pievienot jaunu failu
NoRIB=Nav noteikts BAN
NoParentCompany=Neviens
ExportImport=Import-Export
ExportImport=Imports-Eksports
ExportCardToFormat=Eksporta karti formātā
ContactNotLinkedToCompany=Sazinieties nav saistīta ar trešajām personām
DolibarrLogin=Dolibarr pieteikšanās
@ -369,21 +369,21 @@ ImportDataset_company_3=Bankas rekvizīti
PriceLevel=Cenu līmenis
DeliveriesAddress=Piegādes adreses
DeliveryAddress=Piegādes adrese
DeliveryAddressLabel=Piegādes adrese etiķete
DeliveryAddressLabel=Piegādes adreses etiķete
DeleteDeliveryAddress=Dzēst piegādes adresi
ConfirmDeleteDeliveryAddress=Vai tiešām vēlaties dzēst šo piegādes adresi?
NewDeliveryAddress=Jauna piegādes adrese
AddDeliveryAddress=Pievienot adresi
AddAddress=Pievienot adresi
NoOtherDeliveryAddress=Nav alternatīvu piegādes definēts adrese
SupplierCategory=Piegādātājs kategorija
JuridicalStatus200=Neatkarīga
NoOtherDeliveryAddress=Nav definēta alternatīva piegādes adrese
SupplierCategory=Piegādātāja kategorija
JuridicalStatus200=Neatkarīgs
DeleteFile=Izdzēst failu
ConfirmDeleteFile=Vai jūs tiešām vēlaties izdzēst šo failu?
AllocateCommercial=Piešķirts pārdošanas pārstāvim
SelectCountry=Izvēlieties valsti
SelectCompany=Izvēlieties trešo personu
Organization=Organizēšana
Organization=Organizācija
AutomaticallyGenerated=Automātiski ģenerēts
FiscalYearInformation=Informācija par fiskālo gadu
FiscalMonthStart=Fiskālā gada pirmais mēnesis
@ -391,9 +391,9 @@ YouMustCreateContactFirst=Jums ir izveidot e-pastus kontaktus trešās puses vis
ListSuppliersShort=Piegādātāju saraksts
ListProspectsShort=Saraksts perspektīvas
ListCustomersShort=Klientu saraksts
ThirdPartiesArea=Trešām pusēm platība
LastModifiedThirdParties=Pēdējās %s modificēts trešajām personām
UniqueThirdParties=Kopā unikālu trešajām personām
ThirdPartiesArea=Trešo personu sadaļa
LastModifiedThirdParties=Pēdējās %s modificētāss trešās personas
UniqueThirdParties=Kopējās unikālās trešās personas
InActivity=Atvērt
ActivityCeased=Slēgts
ActivityStateFilter=Aktivitātes statuss

38
htdocs/langs/lv_LV/install.lang
View File

@ -5,16 +5,16 @@ DolibarrWelcome=Laipni lūdzam Dolibarr
ConfFileExists=Konfigurācijas fails <b>%s</b> eksistē.
ConfFileDoesNotExists=Konfigurācijas fails <b>%s</b> neeksistē!
ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurācijas fails <b>%s</b> nav un nevar tikt izveidots!
ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> nevar izveidot.
ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> var izveidot.
ConfFileIsNotWritable=Konfigurācijas failam <b>%s</b> nav rakstīšanas tiesības. Pārbaudiet atļaujas. Par pirmo instalēt, jūsu tīmekļa serveris ir jāpiešķir, lai varētu rakstīt šajā failā laikā konfigurācijas process (&quot;chmod 666&quot;, piemēram, uz kā OS UNIX).
ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
ConfFileReload=Pārlādēt visu informāciju no konfigurācijas faila.
PHPSupportSessions=Šis PHP atbalsta sesijas.
PHPSupportPOSTGETOk=Šis PHP atbalsta mainīgie POST un GET.
PHPSupportPOSTGETKo=Tas ir iespējams, jūsu PHP uzstādīšana neatbalsta mainīgie POST un / vai GET. Pārbaudiet savu parametrs <b>variables_order</b> in php.ini.
PHPSupportGD=Šis PHP atbalsts GD grafiskās funkcijas.
PHPSupportUTF8=Šis PHP atbalsts UTF8 funkcijas.
PHPMemoryOK=Jūsu PHP max sesijas atmiņa ir iestatīts uz <b>%s.</b> Tas būtu pietiekami.
PHPSupportSessions=PHP atbalsta sesijas.
PHPSupportPOSTGETOk=PHP atbalsta mainīgos POST un GET.
PHPSupportPOSTGETKo=Iespējams, ka jūsu PHP neatbalsta mainīgos POST un / vai GET. Pārbaudiet parametrus <b>variables_order</b> failā php.ini.
PHPSupportGD=PHP atbalsta GD grafiskās funkcijas.
PHPSupportUTF8=PHP atbalsta UTF8 funkcijas.
PHPMemoryOK=Jūsu PHP maksimālā sesijas atmiņa ir iestatīts uz <b>%s.</b> Tas ir pietiekami.
PHPMemoryTooLow=Jūsu PHP max sesijas atmiņa ir iestatīts uz <b>%s</b> baitu. Tas būtu pārāk mazs. Mainiet savu <b>php.ini</b> lai uzstādītu <b>memory_limit</b> parametrs vismaz <b>%s</b> baitos.
Recheck=Klikšķiniet šeit, lai vairāk significative testu
ErrorPHPDoesNotSupportSessions=PHP instalācija neatbalsta sesijas. Šī funkcija ir pienākums veikt Dolibarr darbu. Pārbaudiet savu PHP iestatījumus.
@ -63,15 +63,15 @@ CreateUser=Izveidot īpašnieks
DatabaseSuperUserAccess=Datu bāzes serveris - superlietotājs piekļuve
CheckToCreateDatabase=Rūtiņu, ja datu bāze neeksistē, un ir izveidots. <br> Tādā gadījumā, jums ir jāaizpilda pieteikšanās / paroli SuperUser kontā pie šīs lapas apakšā.
CheckToCreateUser=Rūtiņu, ja datu bāzes īpašnieks neeksistē, un ir izveidots. <br> Tādā gadījumā, jums ir jāizvēlas savu lietotājvārdu un paroli, kā arī aizpildīt pieteikšanās / paroli superlietotājs kontā pie šīs lapas apakšā. Ja šī rūtiņa ir nekontrolēti, īpašnieks, datu bāzes un tās paroles ir pastāv.
Experimental=(Experimental)
Experimental=(Eksperimentāls)
DatabaseRootLoginDescription=Reģistrācija no lietotāja ļāva izveidot jaunas datu bāzes vai jaunus lietotājus, obligātos ja jūsu datu bāzes vai tās īpašnieks nav jau eksistē.
KeepEmptyIfNoPassword=Atstājiet tukšu, ja lietotājs nav parole (izvairītos)
SaveConfigurationFile=Saglabāt vērtības
ConfigurationSaving=Ietaupot konfigurācijas failu
ServerConnection=Servera savienojuma
DatabaseConnection=Savienojums ar datubāzi
DatabaseCreation=Datu bāzes izveide
UserCreation=Lietotājs izveide
DatabaseCreation=Datubāzes izveide
UserCreation=Lietotāja izveidošana
CreateDatabaseObjects=Datu bāzes objektu izveide
ReferenceDataLoading=Atsauces dati iekraušana
TablesAndPrimaryKeysCreation=Galdi un primārās atslēgas radīšana
@ -89,7 +89,7 @@ SystemIsUpgraded=Dolibarr ir atjaunota veiksmīgi.
YouNeedToPersonalizeSetup=Jums ir nepieciešams, lai konfigurētu Dolibarr, lai atbilstu jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk:
AdminLoginCreatedSuccessfuly=Dolibarr Administrator Login <b>&quot;%s&quot;</b> izveidots successfuly.
GoToDolibarr=Iet uz Dolibarr
GoToSetupArea=Iet uz Dolibarr (iestatīšanas apgabals)
GoToSetupArea=Iet uz Dolibarr (iestatīšanas apgabalu)
MigrationNotFinished=Versija jūsu datu bāzē, nav pilnībā atjaunināta, tāpēc jums ir, lai palaistu jaunināšanas procesu vēlreiz.
GoToUpgradePage=Iet uz uzlabotu lapu vēlreiz
Examples=Piemēri
@ -101,25 +101,25 @@ AdminLoginAlreadyExists=Dolibarr administratora konts <b>&quot;%s&quot;</b> jau
WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ, kad instalēt vai jaunināšana ir pabeigta, izvairīties no instalētu rīku atkal, jums vajadzētu pievienot failu ar nosaukumu <b>install.lock</b> uz Dolibarr dokumentu direktoriju, lai novērstu ļaunprātīgu izmantošanu, tā.
ThisPHPDoesNotSupportTypeBase=Šis PHP sistēma neatbalsta nevienu interfeisu, lai piekļūtu datu bāzes tipa %s
FunctionNotAvailableInThisPHP=Nav pieejams šajā PHP
MigrateScript=Migrācijas skriptu
MigrateScript=Migrācijas skripts
ChoosedMigrateScript=Izvēlieties migrācijas skriptu
DataMigration=Datu migrācija
DatabaseMigration=Struktūra datu bāzes migrācija
ProcessMigrateScript=Skripts apstrāde
ChooseYourSetupMode=Izvēlies savu iestatīšanas režīmu un noklikšķiniet uz &quot;Start&quot; ...
FreshInstall=Svaigi instalēt
ChooseYourSetupMode=Izvēlies savu instalācijas režīmu un noklikšķiniet uz &quot;Sākt&quot; ...
FreshInstall=Svaiga instalēšana
FreshInstallDesc=Izmantojiet šo režīmu, ja tas ir jūsu pirmo reizi instalēt. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalēt, bet, ja jūs vēlaties uzlabot savu versiju, izvēlieties &quot;Upgrade&quot; režīmā.
Upgrade=Atjaunot
UpgradeDesc=Izmantojiet šo režīmu, ja esat nomainījis veco Dolibarr failus ar failiem no jaunāku versiju. Tas būs uzlabot savu datu bāzi un datus.
Start=Sākums
Start=Sākt
InstallNotAllowed=Setup nav atļauts ar <b>conf.php</b> atļaujas
NotAvailable=Nav pieejams
YouMustCreateWithPermission=Jums ir izveidot failu %s un noteikt rakstīt atļaujas par to, lai web serveri laikā instalēšanas procesu.
CorrectProblemAndReloadPage=Lūdzu noteikt problēmu un nospiediet F5, lai pārlādētu lapu.
AlreadyDone=Jau pārvietoti
DatabaseVersion=Datu bāzes versiju
ServerVersion=Datu bāzes serveris versija
YouMustCreateItAndAllowServerToWrite=Jums ir izveidot šo direktoriju un ļauj web serveri, lai rakstīt to.
DatabaseVersion=Datubāzes versija
ServerVersion=Datubāzes servera versija
YouMustCreateItAndAllowServerToWrite=Jums ir jāizveido šo direktoriju un jāļauj web serverim tajā rakstīt.
CharsetChoice=Rakstzīmju kopa izvēle
CharacterSetClient=Rakstzīmju kopa, ko izmanto radīto HTML interneta lapas
CharacterSetClientComment=Izvēlieties rakstzīmju kopu web displeju. <br/> Noklusējuma ierosinātā rakstzīmju kopa ir viens no jūsu datu bāzē.
@ -142,7 +142,7 @@ ErrorConnection=Server <b>&quot;%s&quot;,</b> datu bāzes nosaukums <b>&quot;%s&
InstallChoiceRecommanded=Ieteicams izvēlēties, lai instalētu versiju <b>%s</b> no jūsu pašreizējā versijā <b>%s</b>
InstallChoiceSuggested=<b>Instalējiet izvēli ierosināja uzstādītājam.</b>
MigrateIsDoneStepByStep=Mērķtiecīga versija (%s) ir plaisa vairākas versijas, tāpēc instalēt vednis nāks atpakaļ ieteikt nākamo migrāciju, kad tas viens būs pabeigts.
CheckThatDatabasenameIsCorrect=Pārbaudiet, datu bāzes nosaukums <b>&quot;%s&quot;</b> ir pareiza.
CheckThatDatabasenameIsCorrect=Pārbaudiet, ka datubāzes nosaukums <b>&quot;%s&quot;</b> ir pareizs.
IfAlreadyExistsCheckOption=Ja šis vārds ir pareizs un ka datu bāze neeksistē vēl, jums ir pārbaudīt opciju &quot;Izveidot datu bāzi&quot;.
OpenBaseDir=PHP openbasedir parametrs
YouAskToCreateDatabaseSoRootRequired=Jūs pārbauda kaste &quot;Izveidot datu bāzi&quot;. Lai to izdarītu, jums ir nepieciešams, lai nodrošinātu login / paroles no superlietotājs (apakšējā formas).

58
htdocs/langs/lv_LV/main.lang
View File

@ -7,19 +7,19 @@ DIRECTION=ltr
FONTFORPDF=Helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=Neviens
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=mm/dd/yy
FormatDateShortJQueryInput=mm/dd/yy
SeparatorThousand=None
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y
FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourShort=%d/%m/%Y %I:%M %p
FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
FormatDateHourTextShort=%b %d, %Y, %I:%M %p
FormatDateHourText=%B %d, %Y, %I:%M %p
DatabaseConnection=Savienojums ar datubāzi
@ -38,10 +38,10 @@ ErrorUnknown=Nezināma kļūda
ErrorSQL=SQL kļūda
ErrorLogoFileNotFound=Logotipa fails &quot;%s&quot; nav atrasts
ErrorGoToGlobalSetup=Iet uz &quot;Sabiedrībai / nodibinājums&quot; uzstādīšana, lai novērstu šo
ErrorGoToModuleSetup=Iet uz moduļa uzstādīšanas, lai atrisinātu šo
ErrorFailedToSendMail=Neizdevās nosūtīt pastu (sūtītājs = %s, uztvērējs = %s)
ErrorGoToModuleSetup=Iet uz moduļa uzstādīšanu, lai atrisinātu šo
ErrorFailedToSendMail=Neizdevās nosūtīt pastu (sūtītājs = %s, saņēmējs = %s)
ErrorAttachedFilesDisabled=Failu pievienšana nav atļauta šajā serverī
ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet vai izmērs nepārsniedz maksimāli pieļaujamo un, ka brīvas vietas ir pieejama uz diska, un nav jau failu ar tādu pašu nosaukumu, kas šajā direktorijā.
ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet vai izmērs nepārsniedz maksimāli pieļaujamo un, ka brīvas vietas ir pieejama uz diska, un nav jau failu ar tādu pašu nosaukumu šajā direktorijā.
ErrorInternalErrorDetected=Atklāta kļūda
ErrorNoRequestRan=Nav pieprasījums skrēja
ErrorWrongHostParameter=Nepareizs uzņēmēja parametrs
@ -139,7 +139,7 @@ Validate=Apstiprināt
ToValidate=Lai apstiprinātu
Save=Saglabāt
SaveAs=Saglabāt kā
TestConnection=Testa savienojums
TestConnection=Savienojuma pārbaude
ToClone=Klonēt
ConfirmClone=Izvēlieties datus, kurus vēlaties klonēt:
NoCloneOptionsSpecified=Nav datu klons noteikts.
@ -148,7 +148,7 @@ Go=Iet
Run=Darboties
CopyOf=Kopija
Show=Rādīt
ShowCardHere=Rādīt kartes
ShowCardHere=Rādīt kartiņu
Search=Meklēšana
SearchOf=Meklēšana
Valid=Derīgs
@ -289,9 +289,9 @@ Amount=Summa
AmountInvoice=Rēķina summa
AmountPayment=Maksājuma summa
AmountHTShort=Summa (neto)
AmountTTCShort=Summa (ieskaitot nodokli)
AmountTTCShort=Summa (ar PVN)
AmountHT=Daudzums (neto pēc nodokļiem)
AmountTTC=Summa (ieskaitot nodokli)
AmountTTC=Summa (ar PVN)
AmountVAT=Summa nodoklis
AmountLT1=Summa nodoklis 2
AmountLT2=Summa nodoklis 3
@ -362,7 +362,7 @@ RemoveFilter=Noņemt filtru
ChartGenerated=Attēls radīts
ChartNotGenerated=Attēls nav radīts
GeneratedOn=Izveidots %s
Generate=Radīt
Generate=Izveidot
Duration=Ilgums
TotalDuration=Kopējais pasākuma ilgums
Summary=Kopsavilkums
@ -512,10 +512,10 @@ Internals=Iekšējs
Externals=Ārējs
Warning=Brīdinājums
Warnings=Brīdinājumi
BuildPDF=Build PDF
RebuildPDF=Pārbūvēt PDF
BuildDoc=Veidot Doc
RebuildDoc=Pārbūvēt Doc
BuildPDF=Izveidot PDF
RebuildPDF=Pārtaisīt PDF
BuildDoc=Izveidot Doc
RebuildDoc=Pārtaisīt Doc
Entity=Vide
Entities=Subjekti
EventLogs=Baļķi
@ -634,7 +634,7 @@ AttributeCode=Atribūts kods
OptionalFieldsSetup=Papildus atribūtu iestatīšana
URLPhoto=URL foto / logo
SetLinkToThirdParty=Saite uz citu trešo pusei
CreateDraft=Izveidot projektu
CreateDraft=Izveidot melnrakstu
ClickToEdit=Klikšķiniet, lai rediģētu
ObjectDeleted=Objekts %s dzēsts
ByCountry=Pēc valsts
@ -670,13 +670,13 @@ Thursday=Ceturtdiena
Friday=Piektdiena
Saturday=Sestdiena
Sunday=Svētdiena
MondayMin=Mo
TuesdayMin=Tu
WednesdayMin=Mēs
ThursdayMin=Th
FridayMin=Fr
SaturdayMin=Sa
SundayMin=Su
MondayMin=Pi
TuesdayMin=Ot
WednesdayMin=Tr
ThursdayMin=Ce
FridayMin=Pie
SaturdayMin=Se
SundayMin=Sv
Day1=Pirmdiena
Day2=Otrdiena
Day3=Trešdiena

48
htdocs/langs/lv_LV/other.lang
View File

@ -6,13 +6,13 @@ Tools=Darbarīki
ToolsDesc=Šī joma ir veltīta grupas dažādiem rīkiem nav pieejama citās izvēlnes ierakstus. <br><br> Šos rīkus var sasniegt no izvēlnes uz pusi.
Birthday=Dzimšanas diena
BirthdayDate=Dzimšanas diena
DateToBirth=Līdzšinējie dzimšanas
BirthdayAlertOn= dzimšanas brīdinājumu aktīvs
BirthdayAlertOff= dzimšanas brīdinājumu neaktīvs
DateToBirth=Dzimšanas datums
BirthdayAlertOn= dzimšanas dienas brīdinājums aktīvs
BirthdayAlertOff= dzimšanas dienas brīdinājums neaktīvs
Notify_FICHINTER_VALIDATE=Intervences apstiprināts
Notify_FICHINTER_SENTBYMAIL=Intervences nosūtīt pa pastu
Notify_BILL_VALIDATE=Klientu rēķins apstiprināts
Notify_BILL_UNVALIDATE=Klientu rēķinu neapstiprinātus
Notify_BILL_VALIDATE=Klienta rēķins apstiprināts
Notify_BILL_UNVALIDATE=Klienta rēķins neapstiprināts
Notify_ORDER_SUPPLIER_APPROVE=Piegādātājs, lai apstiprinātu
Notify_ORDER_SUPPLIER_REFUSE=Piegādātājs lai atteicās
Notify_ORDER_VALIDATE=Klienta rīkojumu apstiprināts
@ -34,7 +34,7 @@ Notify_BILL_SUPPLIER_PAYED=Piegādātāja rēķins jāapmaksā
Notify_BILL_SUPPLIER_SENTBYMAIL=Piegādātāja rēķins nosūtīts pa pastu
Notify_CONTRACT_VALIDATE=Līgums apstiprināts
Notify_FICHEINTER_VALIDATE=Intervences apstiprināts
Notify_SHIPPING_VALIDATE=Piegāde apstiprināts
Notify_SHIPPING_VALIDATE=Piegāde apstiprināta
Notify_SHIPPING_SENTBYMAIL=Piegāde nosūtīt pa pastu
Notify_MEMBER_VALIDATE=Loceklis apstiprināts
Notify_MEMBER_SUBSCRIPTION=Dalībvalsts parakstītā
@ -43,11 +43,11 @@ Notify_MEMBER_DELETE=Biedrs svītrots
NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
MaxSize=Maksimālais izmērs
AttachANewFile=Pievienojiet jaunu failu / dokumentu
AttachANewFile=Pievienot jaunu failu / dokumentu
LinkedObject=Saistītais objekts
Miscellaneous=Dažādi
NbOfActiveNotifications=Paziņojumu skaits
PredefinedMailTest=Tas ir tests pasta \\ nthe divas līnijas ir atdalīti ar rakstatgriezi.. \n\n __ SIGNATURE__
PredefinedMailTest=Šis ir testa e-pasts \\ nthe divas līnijas ir atdalīti ar rakstatgriezi.. \n\n __ SIGNATURE__
PredefinedMailTestHtml=Tas ir <b>tests</b> pasts (vārds testam jābūt treknrakstā). <br> Abas līnijas ir atdalīti ar rakstatgriezi. <br><br> __SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Jūs atradīsiet šeit rēķinu __ FACREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Mēs vēlētos jūs brīdināt, ka rēķins __ FACREF__, šķiet, netiek samaksāja. Tātad tas ir rēķins arestu atkal, kā atgādinājumu. \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
@ -67,31 +67,31 @@ DemoCompanyProductAndStocks=Vadīt nelielu vai vidēja uzņēmuma produktu pārd
DemoCompanyAll=Pārvaldīt maza vai vidēja uzņēmuma ar vairākiem pasākumiem (visi galvenie moduļi)
GoToDemo=Iet uz demo
CreatedBy=Izveidoja %s
ModifiedBy=Grozījumi izdarīti ar %s
ValidatedBy=Apstiprinājis %s
ModifiedBy=Laboja %s
ValidatedBy=Apstiprināja %s
CanceledBy=Atcēla %s
ClosedBy=Aizver ar %s
FileWasRemoved=Failu %s tika noņemts
DirWasRemoved=Directory %s tika noņemts
ClosedBy=Slēdza %s
FileWasRemoved=Fails %s tika dzēsts
DirWasRemoved=Katalogs %s tika dzēsts
FeatureNotYetAvailableShort=Pieejams nākamajā versijā
FeatureNotYetAvailable=Iezīme nav pieejama šajā versijā
FeatureExperimental=Eksperimentāla funkcija. Nav stabils šajā versijā
FeatureNotYetAvailable=Šī iespēja nav pieejama šajā versijā
FeatureExperimental=Eksperimentāla funkcija. Nav stabila šajā versijā
FeatureDevelopment=Attīstības iezīme. Nav stabils šajā versijā
FeaturesSupported=Atbalsta funkcijas
Width=Platums
Height=Augstums
Depth=Dziļums
Top=Tops
Top=Augša
Bottom=Apakša
Left=Left
Right=Tiesības
Left=Kreisā puse
Right=Labā puse
CalculatedWeight=Aprēķina svars
CalculatedVolume=Aprēķinātais tilpums
Weight=Svars
TotalWeight=Kopējais svars
WeightUnitton=tonnas
WeightUnitkg=kg
WeightUnitg=g
WeightUnitg=gr
WeightUnitmg=mg
WeightUnitpound=mārciņa
Length=Garums
@ -117,7 +117,7 @@ VolumeUnitinch3=in3
VolumeUnitounce=unce
VolumeUnitlitre=litrs
VolumeUnitgallon=galons
Size=lielums
Size=izmērs
SizeUnitm=m
SizeUnitdm=dm
SizeUnitcm=cm
@ -167,11 +167,11 @@ ThisIsListOfModules=Šis ir saraksts ar moduļu izraudzītās Šajā demo profil
ClickHere=Noklikšķiniet šeit
UseAdvancedPerms=Izmantojiet papildu atļaujas dažu moduļu
FileFormat=Faila formāts
SelectAColor=Izvēlieties krāsu
SelectAColor=Izvēliieties krāsu
AddFiles=Pievienot failus
StartUpload=Sākt augšupielādēt
StartUpload=Sākt augšupielādi
CancelUpload=Atcelt augšupielādēt
FileIsTooBig=Faili ir pārāk liels
FileIsTooBig=Faili ir pārāk lieli
PleaseBePatient=Lūdzu, esiet pacietīgi ...
RequestToResetPasswordReceived=Pieprasījumu, lai mainītu savu Dolibarr paroli ir saņemta
NewKeyIs=Tas ir jūsu jaunās atslēgas, lai pieteiktos
@ -210,6 +210,6 @@ LibraryVersion=Versija
ExportableDatas=Eksportējami dati
NoExportableData=Nav eksportējami dati (nav moduļi ar eksportējami datu ielādes, vai trūkstošos atļaujas)
ToExport=Eksportēt
NewExport=Jauns eksporta
NewExport=Jauns eksports
##### External sites #####
ExternalSites=Ārējās vietas

2
htdocs/langs/lv_LV/products.lang
View File

@ -100,7 +100,7 @@ PrimaryWay=Primārā ceļš
PriceRemoved=Cena noņemts
BarCode=Svītrkods
BarcodeType=Svītrkoda veids
SetDefaultBarcodeType=Uzstādīt svītrkoda tipu
SetDefaultBarcodeType=Uzstādīt svītrkoda veidu
BarcodeValue=Svītrkoda vērtība
NoteNotVisibleOnBill=Piezīme (nav redzama rēķinos, priekšlikumos ...)
CreateCopy=Izveidot kopiju

30
htdocs/langs/lv_LV/sms.lang
View File

@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - sms
Sms=Sms
SmsSetup=Sms iestatīšana
SmsDesc=Šī lapa ļauj definēt Globālie iespējas, SMS funkcijas
SmsCard=SMS Card
SmsDesc=Šī lapa ļauj definēt Globālās SMS iespējas
SmsCard=SMS karte
AllSms=Visas SMS kampaņas
SmsTargets=Mērķi
SmsRecipients=Mērķi
@ -10,29 +10,29 @@ SmsRecipient=Mērķis
SmsTitle=Apraksts
SmsFrom=Nosūtītājs
SmsTo=Mērķis
SmsTopic=Tēma SMS
SmsTopic=SMS Tēma
SmsText=Ziņa
SmsMessage=SMS ziņojumu
SmsMessage=SMS ziņojums
ShowSms=Rādīt Sms
ListOfSms=Saraksts SMS campains
NewSms=Jauna SMS informācijas kampaņas
ListOfSms=SMS ampaņu saraksts
NewSms=Jauna SMS kampaņa
EditSms=Labot Sms
ResetSms=Jauns sūtīšana
DeleteSms=Dzēst Sms informācijas kampaņas
DeleteASms=Noņemt Sms informācijas kampaņas
PreviewSms=Previuw Sms
ResetSms=Jauna sūtīšana
DeleteSms=Dzēst Sms kampaņu
DeleteASms=Noņemt Sms kampaņu
PreviewSms=Apskatīt Sms
PrepareSms=Sagatavot sms
CreateSms=Izveidot SMS
SmsResult=Rezultāts SMS nosūtīšanas
SmsResult=SMS sutīšanas rezultāts
TestSms=Testa Sms
ValidSms=Apstiprināt Sms
ApproveSms=Apstiprināt Sms
SmsStatusDraft=Melnraksts
SmsStatusValidated=Validēta
SmsStatusValidated=Pārbaudīts
SmsStatusApproved=Apstiprināts
SmsStatusSent=Nosūtīts
SmsStatusSent=Sūtīt
SmsStatusSentPartialy=Nosūtīts daļēji
SmsStatusSentCompletely=Nosūtīja pilnīgi
SmsStatusSentCompletely=Nosūtīta pilnīgi
SmsStatusError=Kļūda
SmsStatusNotSent=Nav nosūtīts
SmsSuccessfulySent=Sms pareizi nosūtīti (no %s līdz %s)
@ -45,7 +45,7 @@ NbOfRecipients=Skaits mērķus
NbOfUniqueSms=Nb DOF unikālo tālruņa numuriem
NbOfSms=Nbre no fona numuru
ThisIsATestMessage=Šī ir testa ziņa
SendSms=Sūti SMS
SendSms=Sūtīt SMS
SmsInfoCharRemain=Nb atlikušo rakstzīmju
SmsInfoNumero= (Formāts starptautiskā ti: 33899701761)
DelayBeforeSending=Kavēšanās pirms nosūtīšanas (minūtēs)

66
htdocs/langs/tr_TR/admin.lang
View File

@ -2,8 +2,8 @@
Foundation=Dernek
Version=Sürüm
VersionProgram=Program sürümü
VersionLastInstall=İlk kurulan sürüm
VersionLastUpgrade=Son yükseltilen sürüm
VersionLastInstall=İlk kurulum sürümü
VersionLastUpgrade=Son yükseltme sürümü
VersionExperimental=Deneysel
VersionDevelopment=Geliştirme
VersionUnknown=Bilinmeyen
@ -15,18 +15,18 @@ PurgeSessions=Oturum Temizleme
ConfirmPurgeSessions=Gerçekten tüm oturumları temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
NoSessionListWithThisHandler=PHP nizde yapılandırılmış olan oturum kayıt işlemcisi çalışmakta olan tüm oturumların listelenmesine izin vermiyor.
LockNewSessions=Yeni bağlantıları kilitle
ConfirmLockNewSessions=Herhangi bir yeni Dolibarr bağlantısını yalnız kendinizle kısıtlamak istediğinizden emin misiniz? Bundan sonra yalnızca <b>%s</b> bağlanabilecektir.
ConfirmLockNewSessions=Herhangi bir yeni Dolibarr bağlantısını yalnız kendinizle kısıtlamak istediğinizden emin misiniz? Bundan sonra yalnızca <b>%s</b> kullanıcısı bağlanabilecektir.
UnlockNewSessions=Bağlantı kilidini kaldır
YourSession=Oturumunuz
Sessions=Kullanıcı oturumu
WebUserGroup=Web sunucusu kullanıcısı/grubu
NoSessionFound=PHP niz etkin oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan (<b>%s</b>) dizini korumalı olabilir (Örneğin işletim sistemi izinleri ve PHP yönergesi open_basedir tarafından korunuyor olabilir).
NoSessionFound=PHP niz etkin oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan (<b>%s</b>) dizini korumalı olabilir (Örneğin, işletim sistemi izinleri ve PHP yönergesi open_basedir tarafından korunuyor olabilir).
HTMLCharset=HTML sayfaları oluşturmak için karakter seti
DBStoringCharset=Veri kaydı için Veritabanı karakter seti
DBStoringCharset=Veri kaydı için veritabanı karakter seti
DBSortingCharset=Veri sıralamak için veritabanı karakter seti
WarningModuleNotActive=<b>%s</b> modülü etkin olmalıdır
WarningOnlyPermissionOfActivatedModules=Burada sadece etkinleştirilmiş modüllerle ile ilgili izinler gösterilir. Diğer modülleri Giriş->Ayarlar->Modüller (Home->Setup->Modules) sayfasından etkinleştirebilirsiniz.
DolibarrSetup=Dolibarr kurulumu ya da yükseltmesi
WarningOnlyPermissionOfActivatedModules=Burada sadece etkinleştirilmiş modüllerle ile ilgili izinler gösterilir. Diğer modülleri Giriş->Ayarlar->Modüller sayfasından etkinleştirebilirsiniz.
DolibarrSetup=Dolibarr kurma ya da yükseltme
DolibarrUser=Dolibarr kullanıcısı
InternalUser=İç kullanıcı
ExternalUser=Dış kullanıcı
@ -35,34 +35,34 @@ ExternalUsers=Dış kullanıcılar
GlobalSetup=Genel Ayarlar
GUISetup=Görünüm
SetupArea=Ayarlar alanı
FormToTestFileUploadForm=Dosya yüklemesi test formu (kuruluma göre)
IfModuleEnabled=Not:Yalnızca <b>%s</b> modülü etkinleştirildiğinde Evet etkilidir.
RemoveLock=<b>%s</b> Dosyasını, güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
RestoreLock=<b>%s</b> Dosyasını, güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin.
FormToTestFileUploadForm=Dosya yükleme deneme formu (kuruluma göre)
IfModuleEnabled=Not: evet yalnızca <b>%s</b> modülü etkinse etkilidir.
RemoveLock=<b>%s</b> dosyasını, güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
RestoreLock=<b>%s</b> dosyasını, güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin.
SecuritySetup=Güvenlik ayarları
ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir.
ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr sürümü gerektirir.
ErrorDecimalLargerThanAreForbidden=Hata, <b>%s</b> den daha yüksek hassasiyet desteklenmez.
DictionnarySetup=Sözlük ayarları
Dictionnary=Sözlükler
ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tip için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz
ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz
ErrorCodeCantContainZero=Kod 0 değeri içeremez
DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle
ConfirmAjax=Açılır Ajax onay pencereleri kullanın
UseSearchToSelectCompany=Üçüncü partileri seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın.<br><br>Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer de SOCIETE_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlıdır.
ActivityStateToSelectCompany= Halen etkin olan ya da durdmuş olan üçüncü partilerin görünmesi/gizlenmesi bir süzgeç seçeneği ekleyin
ActivityStateToSelectCompany= Halen faaliyette olan olan ya da durdurulmuş olan üçüncü partilerin görünmesi/gizlenmesi için bir süzgeç seçeneği ekleyin
UseSearchToSelectContact=Kişi seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın.<br><br>Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlı olacaktır.
SearchFilter=Arama süzgeçi seçenekleri
NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
ViewFullDateActions=Üçüncü sayfada tüm eylem tarihlerini göster
ViewFullDateActions=Üçüncü sayfada tam gün eylemlerini göster
NotAvailableWhenAjaxDisabled=Ajax devre dışı olduğunda kullanılamaz
JavascriptDisabled=JavaScript devre dışı
UsePopupCalendar=Tarih girişi için açılır pencere kullan
UsePreviewTabs=Önizleme sekmesi kullan
ShowPreview=Önizlemeyi göster
PreviewNotAvailable=Önizleme mevcut değil
ShowPreview=Önizleme göster
PreviewNotAvailable=Önizleme yok
ThemeCurrentlyActive=Geçerli etkin tema
CurrentTimeZone=PHP saat dilimi (sunucu)
CurrentTimeZone=PHP Saat Dilimi (sunucu)
Space=Boşluk
Table=Tablo
Fields=Alanlar
@ -74,23 +74,23 @@ NextValueForCreditNotes=Sonraki değer (alacak dekontları)
NextValueForDeposit=Sonraki değer (yatırılan)
NextValueForReplacements=Sonraki değer (yenileme)
MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %s ile sınırlandırır
NoMaxSizeByPHPLimit=Not: PHP yapılandırmasında hiç sınır ayarlanmamış
NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın)
UseCaptchaCode=Giriş sayfasında grafik kodu kullanın
UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için Anti-virüs kullanın
UseCaptchaCode=Giriş sayfasında grafiksel kod (CAPTCHA) kullan
UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için anti-virüs kullan
AntiVirusCommand= Antivirüs komutu tam yolu
AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamWin için örnek: /usr/bin/clamscan
AntiVirusParam= Komut satırında daha fazla parametre
AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv için örnek: /usr/bin/clamscan
AntiVirusParam= Komut satırında daha çok parametre
AntiVirusParamExample= ClamWin için örnek: --database="C:\\Program Files (x86)\\ClamWin\\lib"
ComptaSetup=Muhasebe modülü kurulumu
UserSetup=Kullanıcı yönetimi kurulumu
MenuSetup=Menü yönetimi kurulumu
ComptaSetup=Muhasebe modülü ayarları
UserSetup=Kullanıcı yönetimi ayarları
MenuSetup=Menü yönetimi ayarları
MenuLimits=Sınırlar ve doğruluk
MenuIdParent=Ana menü ID
DetailMenuIdParent=Ana menü ID (bir üst menü için boş)
DetailPosition=Menü konumunu tanımlamak için sıra numarası
PersonalizedMenusNotSupported=Kişiselleştirilmiş menüler desteklenmiyor
AllMenus=Hepsi
AllMenus=Tümü
NotConfigured=Modül yapılandırılmamış
Setup=Ayarlar
Activation=Etkinleştirme
@ -114,7 +114,7 @@ ClientHour=İstemci Saati (kullanıcı)
OSTZ=İşletim Sistemi sunucusu Saat Dilimi
PHPTZ=PHP Saat Dilimi (sunucu)
PHPServerOffsetWithGreenwich=PHP sunucusu Greenwich genişlik sapması (saniye)
ClientOffsetWithGreenwich=İstemci/Tarayıcı Greewich genişlik sapması (saniye)
ClientOffsetWithGreenwich=İstemci/Tarayıcı Greenwich genişlik sapması (saniye)
DaylingSavingTime=Yaz saati
CurrentHour=PHP saati (sunucu)
CompanyTZ=Firma Saat Dilimi (ana firma)
@ -168,13 +168,13 @@ FileNameToGenerate=Oluşturulacak dosya adı
Compression=Sıkıştırma
CommandsToDisableForeignKeysForImport=İçeaktarmada devre dışı bırakılacak yabancı komut tuşları
CommandsToDisableForeignKeysForImportWarning=SQL dökümünü daha sonra geri yükleyebilmeyi isterseniz zorunludur
ExportCompatibility=Oluşturulan dışaaktarım dosyasının uyumuluğu
MySqlExportParameters=MySQL dışaaktarım parametreleri
ExportCompatibility=Oluşturulan verme dosyasının uyumluluğu
MySqlExportParameters=MySQL verme parametreleri
PostgreSqlExportParameters= PostgreSQL dışaaktarım parametreleri
UseTransactionnalMode=İşlem modunu kullanın
FullPathToMysqldumpCommand=mysqldump komutu için tam yol
FullPathToPostgreSQLdumpCommand=pg_dump komutunun tam yolu
ExportOptions=Dışaaktarım seçenekleri
ExportOptions=Verme seçenekleri
AddDropDatabase=DROP VERİTABANI komutu ekle
AddDropTable=DROP TABLOSU komutu ekle
ExportStructure=Yapısı
@ -442,7 +442,7 @@ Module200Name=LDAP
Module200Desc=LDAP dizin senkronizasyonu
Module210Name=PostNuke
Module210Desc=PostNuke entegrasyonu
Module240Name=Veri dışaaktarımı
Module240Name=Veri verme
Module240Desc=Dolibarr verilerini dışaaktarma aracı (yardımlı)
Module250Name=Veri içeaktarımı
Module250Desc=Dolibarr verilerini içeaktarma aracı (yardımlı)
@ -689,7 +689,7 @@ Permission1185=Tedarikçi siparişi onayla
Permission1186=Tedarikçi siparişi ver
Permission1187=Tedarikçi siparişi alındı fişi
Permission1188=Tedarikçi siparişi kapat
Permission1201=Bir dışaaktarım sonucu al
Permission1201=Bir verme sonucu al
Permission1202=Dışaaktarma oluştur/değiştir
Permission1231=Tedarikçi faturalarını oku
Permission1232=Tedarikçi faturaları oluştur/değiştir
@ -1424,7 +1424,7 @@ AccountancyCodeSell=Satış hesap. kodu
AccountancyCodeBuy=Alış hesap. kodu
##### Agenda #####
AgendaSetup=Eylem ve gündem modülü kurulumu
PasswordTogetVCalExport=Dışaaktarım bağlantı yetki anahtarı
PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı
PastDelayVCalExport=Daha büyük eylemi dışaaktarma
AGENDA_USE_EVENT_TYPE=Etkinlik türleri kullan (Yapılandırma->Sözlük->llx_c_actioncomm menüsünden yürütülür)
##### ClickToDial #####

6
htdocs/langs/tr_TR/agenda.lang
View File

@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - agenda
# IdAgenda=ID event
IdAgenda=Kimlik etkinliği
Actions=Eylemler
ActionsArea=Eylem alanı (Olaylar ve görevler)
Agenda= Gündem
@ -68,10 +68,10 @@ AgendaUrlOptions5=Çıktıyı kullanıcı<b>%s</b> tarafından yapılan etkinlik
AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
Busy=Meşgul
# ExportDataset_event1=List of agenda events
ExportDataset_event1=Gündem etkinlikleri listesi
# External Sites ical
ExportCal=Dışaaktarım takvimi
ExportCal=Takvim ver
ExtSites=Dış takvimleri içeaktar
ExtSitesEnableThisTool=Dış takvimleri gündemde göster
ExtSitesNbOfAgenda=Takvimlerin sayısı

2
htdocs/langs/tr_TR/bills.lang
View File

@ -225,7 +225,7 @@ Billed=Faturalandı
RepeatableInvoice=Ön tanımlı fatura
RepeatableInvoices=Ön tanımlı faturalar
Repeatable=Ön tanımlı
Repeatables=Ön tanımlılar
Repeatables=Ön tanımlı
ChangeIntoRepeatableInvoice=Ön tanımlıya dönüştür
CreateRepeatableInvoice=Ön tanımlı fatura oluştur
CreateFromRepeatableInvoice=Ön tanımlı faturadan oluştur

6
htdocs/langs/tr_TR/boxes.lang
View File

@ -24,9 +24,9 @@ BoxTotalUnpaidCustomerBills=Toplam ödenmemiş müşteri faturaları
BoxTotalUnpaidSuppliersBills=Toplam ödenmemiş tedarikçi faturaları
BoxTitleLastBooks=Son yapılan %s kayıt
BoxTitleNbOfCustomers=Müşteri sayısı
BoxTitleLastRssInfos=%s ten en son %s haber
BoxTitleLastRssInfos=%s ten en son %s haberler
BoxTitleLastProducts=Son değiştirilen % s ürün/hizmet
BoxTitleProductsAlertStock=Stoktaki ürün uyarısı
BoxTitleProductsAlertStock=Stok uyarısındaki ürünler
BoxTitleLastCustomerOrders=Son değiştirilen %s müşteri siparişi
BoxTitleLastSuppliers=Son kaydedilen %s tedarikçi
BoxTitleLastCustomers=Son kaydedilen %s müşteri
@ -85,7 +85,7 @@ BoxSuppliersOrdersPerMonth=Aylık tedarikçi siparişleri
BoxProposalsPerMonth=Aylık teklifler
NoTooLowStockProducts=Düşük stok seviyesi altında stok yok
BoxProductDistribution=Ürün/Hizmet dağılımı
BoxProductDistributionFor=%s için %s dağıtımı
BoxProductDistributionFor=%sin %s içindeki dağılımı
ForCustomersInvoices=Müşteri faturaları
ForCustomersOrders=Müşteri siparişleri
ForProposals=Teklifler

6
htdocs/langs/tr_TR/exports.lang
View File

@ -14,11 +14,11 @@ SaveExportModel=Yeniden kullanmak için bu verme profilini kaydedebilirsiniz...
SaveImportModel=Yeniden kullanmak için bu alma profilini kaydedebilirsiniz...
ExportModelName=Verme profili adı
ExportModelSaved=Alma profili <b>%s</b> adıyla kaydedildi.
ExportableFields=Verilebilecek alanlar
ExportableFields=Verilebilir alanlar
ExportedFields=Verilen alanlar
ImportModelName=Alma profili adı
ImportModelSaved=Alma profili <b>%s</b> adıyla kaydedildi.
ImportableFields=Alınabilecek alanlar
ImportableFields=Alınabilir alanlar
ImportedFields=Alınan alanlar
DatasetToExport=Verilecek veri kümesi
DatasetToImport=Veri kümesine alınacak dosya
@ -29,7 +29,7 @@ FieldsOrder=Alan sırası
FieldsTitle=Alanların başlığı
FieldOrder=Alan sırası
FieldTitle=Alan başlğı
ChooseExportFormat=Verme biçimini seçin
ChooseExportFormat=Verme biçimini seç
NowClickToGenerateToBuildExportFile=Şimdi, açılan kutudan dosya biçimini seçin ve verilecek dosyayı oluşturmak için "Oluşturun" düğmesine tıklayın...
AvailableFormats=Kullanılabilecek biçimler
LibraryShort=Kitaplık

2
htdocs/langs/tr_TR/holiday.lang
View File

@ -16,7 +16,7 @@ DateCreateCP=Oluşturma tarihi
DraftCP=Taslak
ToReviewCP=Onay bekliyor
ApprovedCP=Onaylandı
CancelCP=Şptal edildi
CancelCP=İptal edildi
RefuseCP=Reddedildi
ValidatorCP=Onaylayan
ListeCP=Tatil listesi

2
htdocs/langs/tr_TR/main.lang
View File

@ -392,7 +392,7 @@ ReCalculate=Yeniden hesapla
ResultOk=Başarılı
ResultKo=Başarısız
Reporting=Raporlama
Reportings=Raporlamalar
Reportings=Raporlama
Draft=Taslak
Drafts=Taslaklar
Validated=Doğrulanmış

6
htdocs/langs/tr_TR/orders.lang
View File

@ -16,9 +16,9 @@ SupplierOrder=Tedarikçi siparişi
SuppliersOrders=Tedarikçi siparişleri
SuppliersOrdersRunning=Mevcut tedarikçi siparişleri
CustomerOrder=Müşteri siparişi
CustomersOrders=Müşterilerin siparişleri
CustomersOrdersRunning=Mevcut müşterilerin siparişleri
CustomersOrdersAndOrdersLines=Müşteri siparişleri ve sipariş satırları
CustomersOrders=Müşteri siparişleri
CustomersOrdersRunning=Mevcut müşteri siparişleri
CustomersOrdersAndOrdersLines=Müşteri siparişleri ve sipariş kalemleri
OrdersToValid=Doğrulanacak müşteri siparişleri
OrdersToBill=Faturalanacak müşteri siparişleri
OrdersInProcess=İşlemde olan müşteri siparişleri

10
htdocs/langs/tr_TR/products.lang
View File

@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - products
ProductRef=Ürün ref.
ProductLabel=Ürün etiketi
ProductServiceCard=Ürünler/Hizmetler kartı
ProductServiceCard=Ürün/Hizmet kartı
Products=Ürünler
Services=Hizmetler
Product=Ürün
@ -151,13 +151,13 @@ NoPriceDefinedForThisSupplier=Bu tedarikçi/ürün için fiyat/miktar tanımlanm
NoSupplierPriceDefinedForThisProduct=Bu ürün için tedarikçi fiyatı/miktarı tanımlanmamış
RecordedProducts=Ürünler kaydedildi
RecordedServices=Hizmetler kaydedildi
RecordedProductsAndServices=Ürünler/hizmetler kaydedildi
RecordedProductsAndServices=Ürün/hizmet kaydedildi
GenerateThumb=Kararlama (thumb) oluştur
ProductCanvasAbility=Özel “kanvas” eklentileri kullan
ServiceNb=Hizmet sayısı #%s
ListProductServiceByPopularity=Popülerliğe göre ürün / hizmet listesi
ListProductByPopularity=Tutularlığına göre ürünler/hizmetler Listesi
ListServiceByPopularity=Tutulan hizmetler listesi
ListProductServiceByPopularity=Popülerliğine göre ürün/hizmet listesi
ListProductByPopularity=Popülerliğine göre ürünler/hizmetler Listesi
ListServiceByPopularity=Popülerliğine göre hizmetler listesi
Finished=Üretilen ürünler
RowMaterial=İlk malzeme
CloneProduct=Ürün veya hizmet klonla

5
htdocs/main.inc.php
View File

@ -1467,8 +1467,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
// Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
{
$qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring;
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&amp;':'').'optioncss=print" target="_blank">';
$qs=$_SERVER["QUERY_STRING"];
$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
$text.= img_picto('', 'printer.png', 'class="printer"');
$text.='</a>';
$toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);

29
htdocs/product/class/product.class.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
*
@ -1829,6 +1829,33 @@ class Product extends CommonObject
return $this->_get_stats($sql,$mode);
}
/**
* Return nb of units or orders in which product is included
*
* @param int $socid Limit count on a particular third party id
* @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
* @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
function get_nb_ordersupplier($socid,$mode)
{
global $conf, $user;
$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->fournisseur->lire && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.rowid = d.fk_commande";
$sql.= " AND d.fk_product =".$this->id;
$sql.= " AND c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
return $this->_get_stats($sql,$mode);
}
/**
* Lie un produit associe au produit/service

17
htdocs/product/liste.php
View File

@ -271,6 +271,13 @@ else
// Filter on categories
$moreforfilter='';
$colspan=6;
if (! empty($conf->barcode->enabled)) $colspan++;
if (! empty($conf->service->enabled) && $type != 0) $colspan++;
if (empty($conf->global->PRODUIT_MULTIPRICES)) $colspan++;
if ($user->rights->fournisseur->lire) $colspan++;
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) $colspan+=2;
if (! empty($conf->categorie->enabled))
{
$moreforfilter.=$langs->trans('Categories'). ': ';
@ -280,22 +287,20 @@ else
if ($moreforfilter)
{
print '<tr class="liste_titre">';
print '<td class="liste_titre" colspan="9">';
print '<td class="liste_titre" colspan="'.$colspan.'">';
print $moreforfilter;
print '</td></tr>';
}
// Lignes des titres
print "<tr class=\"liste_titre\">";
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
if (! empty($conf->barcode->enabled)) print_liste_field_titre($langs->trans("BarCode"), $_SERVER["PHP_SELF"], "p.barcode",$param,'','',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateModification"), $_SERVER["PHP_SELF"], "p.tms",$param,"",'align="center"',$sortfield,$sortorder);
if (! empty($conf->service->enabled) && $type != 0) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellingPrice"), $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
if ($user->rights->produit->creer) {
print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
}
if ($user->rights->fournisseur->lire) print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("DesiredStock").'</td>';
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
@ -338,7 +343,7 @@ else
}
// Minimum buying Price
if ($user->rights->produit->creer) {
if ($user->rights->fournisseur->lire) {
print '<td class="liste_titre">';
print '&nbsp;';
print '</td>';

20
htdocs/product/stats/commande_fournisseur.php
View File

@ -25,7 +25,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$langs->load("orders");
@ -145,8 +145,8 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
$commandestatic=new Commande($db);
$commandestatic=new CommandeFournisseur($db);
if ($num > 0)
{
$var=True;
@ -154,17 +154,19 @@ if ($id > 0 || ! empty($ref))
{
$objp = $db->fetch_object($result);
$var=!$var;
$commandestatic->id=$objp->commandeid;
$commandestatic->ref=$objp->ref;
$commandestatic->statut=$objp->statut;
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
print $objp->ref;
print '<td>'.$commandestatic->getNomUrl(1)."</td>\n";
print "</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">";
print dol_print_date($db->jdate($objp->date_commande))."</td>";
print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
print '<td align="right">'.$commandestatic->LibStatut($objp->statut,$objp->facture,5).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($objp->date_commande))."</td>";
print '<td align="right">'.price($objp->total_ht)."</td>\n";
print '<td align="right">'.$commandestatic->getLibStatut(4).'</td>';
print "</tr>\n";
$i++;
}

6
htdocs/product/stats/fiche.php
View File

@ -3,6 +3,7 @@
* Copyright (c) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -142,6 +143,9 @@ if (! empty($id) || ! empty($ref))
'invoices' =>array('modulepart'=>'productstats_invoices',
'file' => $object->id.'/invoices12m.png',
'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices"))),
'orderssuppliers'=>array('modulepart'=>'productstats_orderssuppliers',
'file' => $object->id.'/orderssuppliers12m.png',
'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders"))),
'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
'file' => $object->id.'/invoicessuppliers12m.png',
'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices"))),
@ -165,6 +169,7 @@ if (! empty($id) || ! empty($ref))
if ($key == 'orders') $graph_data = $object->get_nb_order($socid,$mode);
if ($key == 'invoices') $graph_data = $object->get_nb_vente($socid,$mode);
if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode);
if ($key == 'orderssuppliers') $graph_data = $object->get_nb_ordersupplier($socid,$mode);
if (is_array($graph_data))
{
@ -204,6 +209,7 @@ if (! empty($id) || ! empty($ref))
if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
if ($i % 2 == 0)

40
htdocs/societe/class/companybankaccount.class.php
View File

@ -77,13 +77,23 @@ class CompanyBankAccount extends Account
{
$now=dol_now();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, '".$this->db->idate($now)."')";
// Correct default_rib to be sure to have always one default
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1";
$result = $this->db->query($sql);
if ($result)
{
$numrows=$this->db->num_rows($result);
if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec)";
$sql.= " VALUES (".$this->socid.", '".$this->db->idate($now)."')";
$resql=$this->db->query($sql);
if ($resql)
{
if ($this->db->affected_rows($resql))
{
$this->default_rib = 1;
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
return 1;
}
@ -120,7 +130,7 @@ class CompanyBankAccount extends Account
// return 0;
// }
if (!$this->id) {
if (! $this->id) {
$this->create();
}
@ -204,6 +214,30 @@ class CompanyBankAccount extends Account
}
}
/**
* Delete a rib from database
*
* @param User $user User deleting
* @return int <0 if KO, >0 if OK
*/
function delete($user)
{
global $conf;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
$sql.= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::delete sql=".$sql);
$result = $this->db->query($sql);
if ($result) {
return 1;
}
else {
dol_print_error($this->db);
return -1;
}
}
/**
* Return RIB
*

4
htdocs/societe/class/societe.class.php
View File

@ -2552,8 +2552,8 @@ class Societe extends CommonObject
$this->tva_assuj=((isset($conf->global->FACTURE_TVAOPTION) && $conf->global->FACTURE_TVAOPTION=='franchise')?0:1);
// Define if company use local taxes
$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')?1:0);
$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')?1:0);
$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
}
/**

12
htdocs/societe/consumption.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
*
* Version V1.1 Initial version of Philippe Berthet
* Version V2 Change to be compatible with 3.4 and enhanced to be more generic
@ -30,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
@ -173,7 +175,15 @@ $thirdTypeSelect='customer';
}
if ($type_element == 'order')
{
// TODO
$documentstatic=new Commande($db);
$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, "1" as doc_type, f.date_commande as datePrint, ';
$tables_from = MAIN_DB_PREFIX."commande as f,".MAIN_DB_PREFIX."commandedet as d";
$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
$where.= " AND d.fk_commande = f.rowid";
$where.= " AND f.entity = ".$conf->entity;
$datePrint = 'f.date_creation';
$doc_number='f.ref';
$thirdTypeSelect='customer';
}
if ($type_element == 'supplier_order')

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