Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +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
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
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
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
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
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Laurent Destailleur
050819ce0b
Fix: dead code
2013-06-09 16:15:12 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Marcos García
62475866e3
Style improvements and fixed a "bug" that showed "()" when no note was entered
2013-05-12 12:06:45 +02:00
Marcos García
dcb6bb4c2e
Improvement to holidays module
...
Creation date can't be higher than today
2013-05-12 11:38:17 +02:00
Marcos García
c61f48a98f
Added missing translation in holidays module
2013-05-12 11:36:49 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
Marcos García
9f537cedd1
Replaced "Jours" with DurationDays translation key
2013-05-06 17:48:20 +02:00
Marcos García
da61a24831
Missing translations
2013-05-06 17:47:53 +02:00
Marcos García
f5b04fdfe5
Stetic fix: Select was not valigned
2013-05-06 17:47:21 +02:00
Marcos García
896a60296c
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-06 17:22:31 +02:00
Juanjo Menent
0e49ec93f9
Merge pull request #929 from marcosgdf/holidays-minor
...
Minor changes in holidays module
2013-05-06 08:17:25 -07:00
Marcos García
bd9849c1aa
Fixed bug with holidays log
2013-05-06 17:15:49 +02:00
Juanjo Menent
a53e4123eb
Merge pull request #927 from marcosgdf/holidays-bug
...
Fixed bug with holidays log
2013-05-06 08:14:46 -07:00
Marcos García
bbe1db0e9f
Replaced addslashes with $this->db->escape
2013-05-06 17:13:43 +02:00
Marcos García
e1913f4a13
Stetic fix: Select was not valigned
2013-05-06 17:07:20 +02:00
Marcos García
7e11f7466a
Missing translations
2013-05-06 17:07:12 +02:00
Marcos García
05be90a220
Using month selector instead of direct input
2013-05-06 17:06:41 +02:00
Marcos García
f4973d5aa9
Holidays log now shows recent changes first
2013-05-06 17:04:21 +02:00
