Commit Graph

40612 Commits

Author SHA1 Message Date
Laurent Destailleur
9e8a8b4da5 Fix: regex syntax 2014-08-08 01:18:20 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/projet/class/project.class.php
2014-08-08 01:09:46 +02:00
Laurent Destailleur
e8ffb0dacf Fix: sql error on editing project with pgsql.
Fix: Error management on project edit.
2014-08-08 01:02:59 +02:00
Laurent Destailleur
159d0c7057 Fix: get_full_tree was not working correctly. 2014-08-07 20:21:16 +02:00
Laurent Destailleur
de76fe4951 Fix: Missing join into request.
Conflicts:
	htdocs/compta/facture.php
2014-08-07 15:05:31 +02:00
Laurent Destailleur
8c728ac638 Fix: bad regex syntax 2014-08-07 12:47:14 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
2014-08-07 12:15:18 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport.
Conflicts:
	htdocs/projet/activity/list.php
2014-08-07 12:09:28 +02:00
Laurent Destailleur
d694b10274 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-06 17:15:50 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
Laurent Destailleur
544e75c2a1 Fix: Clean init data 2014-08-06 10:57:35 +02:00
Laurent Destailleur
bf9ec22cd0 Fix: Clean init data 2014-08-06 10:57:26 +02:00
Laurent Destailleur
338c4543fc Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:52:57 +02:00
Laurent Destailleur
098c5febd5 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:51:16 +02:00
Laurent Destailleur
272c438431 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:49:22 +02:00
Laurent Destailleur
800ded40d3 Fix: Removed table of external modules 2014-08-06 10:40:26 +02:00
Laurent Destailleur
d8fe7b904e Fix: Removed table of external modules 2014-08-06 10:38:14 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
65b7f3d744 Fix: Clean data init 2014-08-06 10:18:32 +02:00
Laurent Destailleur
8c25fdfd2c Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:16:25 +02:00
Laurent Destailleur
86f4b874eb Fix: Clean data init 2014-08-06 10:15:32 +02:00
Laurent Destailleur
7f0baa3d65 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:12:47 +02:00
Laurent Destailleur
bb201010e5 Fix: Clean data init 2014-08-06 10:12:02 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Laurent Destailleur
069cf61d72 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-08-06 10:03:50 +02:00
Laurent Destailleur
0e2de54660 Fix: Clean data init 2014-08-06 10:02:02 +02:00
Laurent Destailleur
f91e847562 Qual: Removed had coded value for version. 2014-08-06 09:23:37 +02:00
Laurent Destailleur
2d524f2edc Fix: Holiday module was broken. Initializaion of amount of holidays
failed.
2014-08-06 09:09:22 +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
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions.
Conflicts:
	htdocs/core/lib/pdf.lib.php
2014-08-06 01:45:31 +02:00
Laurent Destailleur
b182b2ff44 Update changelog 2014-08-06 00:11:42 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
2014-08-04 12:49:54 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5
Fix : Fusion PDF button on unpaid invoice is no more displayed
2014-08-04 09:08:47 +02:00
Laurent Destailleur
e56956110f Merge pull request #1796 from atm-maxime/3.5
Fix : shipping list SQL request was not filtering on shipping element
2014-08-04 08:58:41 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Florian HENRY
8f8c6a9c9e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-01 14:56:30 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Laurent Destailleur
cf72c05a99 Fix: debian package provided by dolibarr team use embedded libraries. 2014-08-01 02:11:37 +02:00
Florian HENRY
30b41fbd18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-28 16:30:38 +02:00
Laurent Destailleur
adb70ecf24 Fix: [ bug #1528 ] Leopard Services numeration module description is not
translated.
2014-07-26 17:40:07 +02:00
Laurent Destailleur
f794b820c3 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-26 17:30:41 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
s'appliquent pas
2014-07-26 17:30:10 +02:00
Laurent Destailleur
45435b597e Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
s'appliquent pas
2014-07-26 17:18:19 +02:00
Florian HENRY
5309fb380b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-21 08:14:15 +02:00