Commit Graph

81 Commits

Author SHA1 Message Date
Laurent Destailleur
a7dda865c9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-04 15:29:54 +02:00
Laurent Destailleur
a3beceade2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-04 15:28:55 +02:00
Ferran Marcet
09c271b7c5 Fix: Correction in the calculation of the next week 2017-08-02 10:31:16 +02:00
Laurent Destailleur
ac32161711 Fix error in total of tasks 2017-01-20 14:36:56 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
Laurent Destailleur
8fcd2fd76c Merge pull request #5436 from atm-alexis/FIX_3.8_bug_4682
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
2016-07-14 23:02:38 +02:00
Alexis Algoud
afeb212520 FIX #4682 dol_time_plus_duree use datetime instead of strtotime 2016-06-30 16:16:27 +02:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
5d5cfd498a Add holiday date functions into PHPUnit 2015-11-28 19:54:16 +01:00
Laurent Destailleur
5b22eee938 FIX #4099 2015-11-28 16:11:15 +01:00
Raphaël Doursenaud
973e42d10f FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
Laurent Destailleur
1b409538a8 Fix #3400
Conflicts:
	htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Juanjo Menent
c5d8fa4602 Fix: solves #2644 2015-04-18 19:14:30 +02:00
Laurent Destailleur
49824a0e56 Method colorStringToArray can accept the #
Method monthArray can return short label of month
2015-03-22 18:17:25 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
aspangaro
a1980a1917 Correct travis error - Not me ! 2014-11-02 22:04:01 +01:00
Laurent Destailleur
627f5694f0 Fix: Infinite loop 2014-11-02 21:19:00 +01:00
Laurent Destailleur
5a18904bb4 Fix: Infinite loop 2014-11-02 21:16:31 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/core/lib/date.lib.php
2014-10-12 02:13:38 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
b94d913440 New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to
automatically set end date of event to start date + delta on creation
page.
2014-09-15 10:19:08 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
de0cf14ece Fix: Bad position of week 2014-09-05 15:10:31 +02:00
Laurent Destailleur
0e944b0403 Fix: Pb with week position when week start on sunday. 2014-09-05 15:00:53 +02:00
Laurent Destailleur
175e3eca6b Work on agenda view per user 2014-09-05 13:48:55 +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
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
Raphaël Doursenaud
eca27d6711 Qual: Wrong type in method documentation 2014-04-23 18:23:59 +02:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases.
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
2014-03-21 16:22:41 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type
Timestamps are integers so let's document this correctly
2013-11-07 21:47:13 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS
Fix: create member was missing field import_key
New: Uniformize code
2013-06-27 17:45:58 +02:00
Laurent Destailleur
834a3fd3c5 Qual: Clean code. Removed useless functions and params 2013-06-17 14:12:59 +02:00