lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,317 Commits 43 Branches 150 Tags 886 MiB
3.7
Commit Graph

170 Commits

Author SHA1 Message Date
philippe grand
fed70b1376 translation missing 2015-09-03 12:57:57 +02:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Marcos García de La Fuente
0a0e0e068c Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-28 01:02:44 +01:00
Frédéric FRANCE
baaadd772e Update /holiday/index.php 2014-11-23 17:43:28 +01:00
Andrelec1
667f1bf497 Fix : more than 1000 holidays 
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
 2014-11-22 15:59:51 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
aspangaro
5b23180303 Holiday list 2014-11-02 21:28:02 +01:00
Laurent Destailleur
d396c62499 Fix: alignement 2014-10-22 23:49:52 +02:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
cffc92a5c0 Fix: PHPCS 2014-08-06 09:46:09 +02:00
Laurent Destailleur
82921232f5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2014-08-06 09:27:01 +02:00
Laurent Destailleur
2169a8668d Fix: PHPCS 2014-08-06 09:18:44 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/holiday/fiche.php
 2014-08-06 09:12:29 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore. 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2014-08-06 09:08:28 +02:00
Laurent Destailleur
4bd257f007 New: Work on type of leave. 2014-08-06 03:23:16 +02:00
Laurent Destailleur
bbb58dd365 New: Add navigation on year on page of leaves. 2014-08-06 03:09:59 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
Laurent Destailleur
83564b2b04 Fix: Table holiday_user was not initialized anymore. 2014-08-06 02:43:50 +02:00
Laurent Destailleur
75f01cbead Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2014-08-06 01:50:22 +02:00
Laurent Destailleur
8f73c7a82a Fix: Remove debug 2014-08-06 01:49:22 +02:00
Laurent Destailleur
9b9e51d50f Fix: removed debug 2014-08-06 01:48:51 +02:00
Laurent Destailleur
277bfc8012 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 01:46:57 +02:00
Laurent Destailleur
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
0f9aa69e4e Fix: New: Differentiate text and img for better accessibility. 2014-07-29 21:34:23 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
fmarcet
ab57c236be New: Can have half day holiday 
New: Add Spanish holidays
Fix: Holiday log shows nothing
 2014-07-10 12:06:09 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
a51e18a5a7 Fix: $error var must use type int and be increased when error found. 
Using $error as boolean at some place was source of error.
 2014-05-24 15:20:26 +02:00
Laurent Destailleur
33fe18490a Removed useless translation key 2014-05-10 15:50:32 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00