lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,635 Commits 43 Branches 150 Tags 886 MiB
5ca6593a57
Commit Graph

48635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
9451296f6b Fix: Missing tooltip 2015-07-28 12:11:39 +02:00
Laurent Destailleur
a16d6b037c Fix: bad link to task 2015-07-28 12:06:57 +02:00
Laurent Destailleur
7e7d39f068 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-27 20:22:51 +02:00
Laurent Destailleur
f9fe623522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-27 17:09:27 +02:00
Laurent Destailleur
d128cf69d9 Doxygen doc 2015-07-27 17:09:16 +02:00
Laurent Destailleur
e6f5450265 Merge pull request #3299 from FHenry/3.8_jquery 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7
 2015-07-23 22:48:10 +02:00
Laurent Destailleur
215d62f48d Merge pull request #3295 from FHenry/3.8 
FIX : #3305
 2015-07-23 22:08:08 +02:00
Laurent Destailleur
9ba9db9abe Merge pull request #3303 from All-3kcis/develop-patch-5 
Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS"
 2015-07-23 22:07:15 +02:00
Laurent Destailleur
ad43ef6112 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-22 23:34:07 +02:00
Laurent Destailleur
f52b5a240a Show sql query when log level is lower than LOG_DEBUG 2015-07-22 23:33:48 +02:00
Juanjo Menent
bd48163427 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:27:05 +02:00
Juanjo Menent
16ae9633e5 FIX: Change Spanish provinces code to ISO 2015-07-22 11:26:20 +02:00
Juanjo Menent
70f9aa9ece Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:08:22 +02:00
Juanjo Menent
7c8b1feaeb FIX: Change Spanish provinces code to ISO 2015-07-22 10:57:25 +02:00
Laurent Destailleur
ad56cb4aa0 Fix upload of files should be possible on mobile device. 2015-07-21 18:27:34 +02:00
Laurent Destailleur
814cec880a Fix filter can be empty 2015-07-21 13:38:24 +02:00
Laurent Destailleur
268674899e Fix: css on current day 2015-07-21 12:30:12 +02:00
Laurent Destailleur
977d2d3463 Fix: The hook addCalendarChoice was only visible into tabs index.php 2015-07-21 12:19:21 +02:00
All-3kcis
d3f283a8d9 Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS" 2015-07-21 11:43:23 +02:00
Florian HENRY
82e9bf6b68 add test on test arrays with show/hide column 2015-07-21 09:38:43 +02:00
Florian HENRY
0179fd2860 Remove customer specifics comment 2015-07-21 09:15:35 +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
Laurent Destailleur
2bebb869fb Fix bad signature of fetch. The ref_ext is missing. 2015-07-20 17:19:44 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
d843b1fbe4 Fix: No html form tag inside a table tag. Must be out of table. 2015-07-20 13:03:12 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Florian HENRY
7ce5424f9a NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 2015-07-20 08:41:18 +02:00
Florian HENRY
0394c9d594 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-07-20 08:32:07 +02:00
Florian HENRY
798b7924b5 Fix test_arrays 2015-07-20 08:30:50 +02:00
Laurent Destailleur
2df2e8b44e Merge remote-tracking branch 'origin/3.8' into develop 2015-07-20 00:55:30 +02:00
Laurent Destailleur
c84b55e1af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-20 00:55:03 +02:00
Laurent Destailleur
85f344a23e Fix bad link 
Fix missing css
 2015-07-19 23:39:07 +02:00
Laurent Destailleur
d08a1ec116 Merge pull request #3282 from elarifr/develop-userapikey 
fix user role and store fake api_key if api module no enabled
 2015-07-19 23:28:36 +02:00
elarifr
80c8c30ba7 generate fake api_key to store if api module not enabled 
correct user role select if api module not enabled
 2015-07-19 22:43:06 +02:00
Laurent Destailleur
22ff1d7a71 Fix no space into translation key 2015-07-19 21:47:40 +02:00
Laurent Destailleur
c0146c2ce3 Fix missing translation key 2015-07-19 20:23:58 +02:00
Laurent Destailleur
c42859e85a Merge pull request #3280 from Dolibarr/revert-3212-3.8 
Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7…
 2015-07-19 16:10:03 +02:00
Laurent Destailleur
705245d70d Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 #3258" 2015-07-19 18:07:26 +02:00
Laurent Destailleur
c05900aece Merge pull request #3212 from FHenry/3.8 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7  #3258
 2015-07-19 16:02:59 +02:00
Laurent Destailleur
b59b7785ee Fix error management 2015-07-19 16:00:12 +02:00
Laurent Destailleur
4179d7dd5d Prepare 3.8 2015-07-19 15:50:53 +02:00
Laurent Destailleur
fdbfc7facd Fix missing language load 2015-07-19 15:48:35 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
c8ea72473e Merge branch 'marcosgdf-bug-1925' into 3.7 2015-07-19 15:31:27 +02:00
Laurent Destailleur
dafe0a37cf Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
 2015-07-19 15:31:02 +02:00
Laurent Destailleur
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +02:00
Laurent Destailleur
8fa35fcb7b Merge pull request #3278 from marcosgdf/bug-1634 
FIX [ bug 1634 ] Error deleting a project when it had many linked objects
 2015-07-19 15:26:45 +02:00