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
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
kaos
f55bdc64bd
fixes #1300
2014-03-15 11:10:20 +01:00
kaos
1cb71674d7
fixes #1300
2014-03-15 11:06:50 +01:00
Laurent Destailleur
774017672f
Fix: Number of day calculation. Add PHPUnit case.
2014-03-05 20:52:27 +01:00
Laurent Destailleur
5501809844
Fix: sql compare on int must not contains quotes.
2014-02-12 18:47:16 +01:00
Alexis Algoud
d8e5fd20d2
In certain case, holiday_users won't be update (1 delete, 1 add for ex)
...
Add a fonction for count the real number of user without CP
2014-02-10 09:39:26 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
3378855694
New: Can cancel holidays that were previously validated
2013-09-24 18:06:07 +02:00
Laurent Destailleur
4c1faf626e
Merge remote-tracking branch 'origin/3.4' into develop
2013-09-14 14:36:17 +02:00
Laurent Destailleur
707bba3d7d
Fix: W3C
2013-09-13 10:40:49 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
8e6860ac72
Fixed developer intent
2013-09-05 17:01:15 +02:00
