lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,342 Commits 43 Branches 150 Tags 886 MiB
201db3b720
Commit Graph

60342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
201db3b720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/tasks/task.php
 2017-07-14 00:24:49 +02:00
Laurent Destailleur
f9a99f506f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-14 00:17:49 +02:00
Laurent Destailleur
f106ff7e76 Fix var init 2017-07-13 23:52:02 +02:00
Laurent Destailleur
312b153005 Fix phpcs 2017-07-13 23:46:01 +02:00
Laurent Destailleur
652d715fdc Better translation 2017-07-13 18:18:56 +02:00
Laurent Destailleur
3db7bd7624 Fix look and feel v6 2017-07-13 17:44:12 +02:00
Laurent Destailleur
2b77c9b5c7 FIX #7050 2017-07-13 16:56:36 +02:00
Laurent Destailleur
be8e15a777 Prepare fix 2017-07-13 16:25:38 +02:00
Laurent Destailleur
7eb4562432 Code comment 2017-07-13 15:22:07 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
Laurent Destailleur
c434f72d31 Merge pull request #7146 from hregis/6.0_bug3 
Fix: travis error (categorie)
 2017-07-13 14:46:41 +02:00
Laurent Destailleur
ae7797ebf2 Look and feel v6 2017-07-13 14:43:41 +02:00
Laurent Destailleur
85d9a2f790 Merge pull request #7145 from hregis/6.0_bug2 
Fix: missing group name with dol_banner_tab
 2017-07-13 14:36:17 +02:00
Laurent Destailleur
4ee70e496e Merge pull request #7143 from hregis/6.0_bug 
Fix: missing entity filter (multicompany)
 2017-07-13 14:33:45 +02:00
Laurent Destailleur
74e29a3fdb FIX empty object 2017-07-13 14:32:49 +02:00
Laurent Destailleur
bea3ced763 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-13 14:32:03 +02:00
Laurent Destailleur
dec1ae863b Merge pull request #7142 from atm-alexis/FIX_task_view_without_thirdparty 
FIX empty thirdparty getNomUrl() call without thirdparty
 2017-07-13 14:31:08 +02:00
Laurent Destailleur
cbd9adc052 Update task.php 2017-07-13 14:30:50 +02:00
Laurent Destailleur
7079e6d4bc Update task.php 2017-07-13 14:29:47 +02:00
Laurent Destailleur
9ca12c9d11 Merge pull request #7141 from hregis/6.0 
Fix: error during upgrade process
 2017-07-13 14:28:47 +02:00
Laurent Destailleur
80210dfb18 Merge pull request #7140 from hregis/develop_bug_restapi 
Fix: error during upgrade process
 2017-07-13 14:28:07 +02:00
Laurent Destailleur
58ce8eaf46 Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing 
Fix AdvtargetEmailing
 2017-07-13 14:26:23 +02:00
Laurent Destailleur
13cee53384 Update 5.0.0-6.0.0.sql 2017-07-13 14:26:10 +02:00
Laurent Destailleur
10337b4914 Update llx_mailing_cibles.sql 2017-07-13 14:25:42 +02:00
Laurent Destailleur
f5995cadef Fix detection of payment for credit note 2017-07-13 14:16:26 +02:00
Laurent Destailleur
743de4e586 FIX Option to classify proposal/order in workflow module must not set 
source object to billed if amount differs.
 2017-07-13 12:42:32 +02:00
Laurent Destailleur
2141cfb282 Fix code of triggers (disabled if module not enabled) 2017-07-13 11:25:25 +02:00
Laurent Destailleur
028f1f5133 Fix default currency in creation form. 2017-07-13 10:16:40 +02:00
Laurent Destailleur
fb0298ff1c Fix template should work if module in root dir 2017-07-13 09:15:37 +02:00
Laurent Destailleur
0b4a1d9b65 Protection to avoid mass action execution when not required 2017-07-13 02:49:40 +02:00
Laurent Destailleur
9127892c71 Fix several minor bugs 2017-07-13 02:33:48 +02:00
Laurent Destailleur
bb828f5c9c Fix vat src code must be visible into bind step 2017-07-13 01:14:27 +02:00
Laurent Destailleur
3fd505d98f Fix error management when making 2017-07-13 01:02:35 +02:00
Laurent Destailleur
3fae3a9eda Fix typo 2017-07-13 00:44:04 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
4b4dcf2e01 Fix overload with a protection for rare case with very high nb of event 2017-07-12 23:05:26 +02:00
Laurent Destailleur
0d4d4516c8 Fix template for css and js 2017-07-12 22:52:56 +02:00
Laurent Destailleur
24863337da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-12 20:34:22 +02:00
Laurent Destailleur
838958a888 Fix count show 0 if empty 2017-07-12 20:32:49 +02:00
Laurent Destailleur
44b6b8cc65 Fix purge of log files was missing some log files. 2017-07-12 20:27:25 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
florian HENRY
816283d1e5 fix SQL 2017-07-12 17:51:32 +02:00
florian HENRY
67664331e3 Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing 2017-07-12 17:49:44 +02:00
Regis Houssin
44a44ab0a2 Fix: travis error 2017-07-12 16:45:32 +02:00
Regis Houssin
d63e15f0c6 Fix: missing group name with dol_banner_tab 2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
florian HENRY
379a5b9e16 fix : SQL migration in capital letters 2017-07-12 12:35:30 +02:00
Laurent Destailleur
25f9d782dc NEW Add non intrusive js library to make syntaxic coloring of textarea 2017-07-12 12:30:07 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00