lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,546 Commits 43 Branches 150 Tags 886 MiB
98ddb38c00
Commit Graph

59546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
98ddb38c00 Merge pull request #6916 from aspangaro/6.0-vat2 
FIX : Vat payment - Sql error / Add information in tooltip / Correct book entry in general ledger
 2017-05-31 19:30:07 +02:00
Laurent Destailleur
6837312041 Merge branch 'develop' into 6.0-vat2 2017-05-31 19:28:41 +02:00
Laurent Destailleur
6c7179d281 Test of commit with autoremove trail space 2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe NEW #6915 Simplest change. 2017-05-31 19:15:39 +02:00
Laurent Destailleur
f829ccc11b Merge pull request #6908 from aspangaro/6.0-d3 
Fix : Correct donation when we write operation in general ledger
 2017-05-31 18:58:50 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-05-31 12:50:29 +02:00
Laurent Destailleur
e41541ab79 Enhance detection of changelog not updated 2017-05-31 12:47:21 +02:00
Laurent Destailleur
b2779e2c08 Typo 2017-05-31 12:05:53 +02:00
Laurent Destailleur
10ac53077e Code comment 2017-05-31 11:51:38 +02:00
Laurent Destailleur
145cb628cd FIX dol_string_nohtmltag make 2 passes to clean html into html 
attributes.
 2017-05-31 11:11:25 +02:00
Laurent Destailleur
292571688b Fix error message not reported 2017-05-31 10:49:06 +02:00
Alexandre SPANGARO
21183f91a3 FIX : Vat payment - Sql error / Add information in tooltip / Correct writting in general ledger 2017-05-31 05:27:39 +02:00
Laurent Destailleur
c39ca4cff8 NEW Introduce function dol_compress_dir 2017-05-31 00:20:35 +02:00
Laurent Destailleur
48a6e9e038 Removed not used files 2017-05-30 22:31:57 +02:00
Laurent Destailleur
5d115bcf69 Fix deadlock feature, can't process a leave request when validator has 
left company.
 2017-05-30 20:58:32 +02:00
Laurent Destailleur
10975112ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-30 09:46:33 +02:00
Alexandre SPANGARO
a0de94ae09 Fix : Correct donation when we write operation in general ledger 2017-05-30 06:28:19 +02:00
Laurent Destailleur
fa6bc03765 Fix typo 2017-05-30 01:34:20 +02:00
Laurent Destailleur
d9cdad6a77 Merge pull request #6904 from OPEN-DSI/core_holiday_add_triggers 
NEW Core Holiday: Add triggers for create, update and delete functions of the class Holiday
 2017-05-30 01:26:20 +02:00
Laurent Destailleur
11f58c7bda Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-30 00:44:42 +02:00
Laurent Destailleur
bd891ea56a Deploy to server works even when cloudflare is active. 2017-05-30 00:26:02 +02:00
Laurent Destailleur
ef83a0c15e Merge 2017-05-29 21:29:17 +02:00
Laurent Destailleur
8edce66c08 Update ChangeLog for 4.0.6 2017-05-29 21:27:35 +02:00
Laurent Destailleur
eea6461369 Update ChangeLog for 4.0.6 2017-05-29 21:27:22 +02:00
Laurent Destailleur
a057cfec91 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 21:17:54 +02:00
Laurent Destailleur
f21ec76bc0 Exclude dir 2017-05-29 21:16:37 +02:00
Laurent Destailleur
df729d8889 Fix travis 2017-05-29 19:28:43 +02:00
Laurent Destailleur
d56cd44ebc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 19:11:41 +02:00
Laurent Destailleur
ad656e6d35 Look and feel v6 2017-05-29 15:34:00 +02:00
Laurent Destailleur
59ab9a4421 FIX #6850 2017-05-29 15:25:37 +02:00
Laurent Destailleur
400b3320aa NEW Introduction option MAIN_HTTP_CONTENT_SECURITY_POLICY 2017-05-29 15:20:50 +02:00
Laurent Destailleur
c71488e58b Removed deprecated code 2017-05-29 15:09:13 +02:00
Laurent Destailleur
ae6c58fb57 FIX #6808 2017-05-29 14:16:09 +02:00
David
d8c5ec2aef FIX: REST API not possible to add agendaevents 2017-05-29 13:47:42 +02:00
Regis Houssin
96b8339d21 Fix: [Restler] Delete the cache file otherwise it does not update 2017-05-29 13:46:03 +02:00
Laurent Destailleur
d2813eabbc FIX #6877 
Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-05-29 13:41:59 +02:00
Laurent Destailleur
19b8918caf FIX #6881 2017-05-29 13:40:08 +02:00
Laurent Destailleur
4824942369 FIX #6877 2017-05-29 13:39:07 +02:00
Laurent Destailleur
85e0ded573 FIX #6881 2017-05-29 13:35:51 +02:00
Laurent Destailleur
c26e072694 Code comment 2017-05-29 13:29:27 +02:00
Laurent Destailleur
7066ec7dab NEW Can clone expense report on another user 2017-05-29 13:22:52 +02:00
Laurent Destailleur
6f723490c2 Fix syntax error 2017-05-29 12:58:23 +02:00
Laurent Destailleur
3bd3387664 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 12:56:11 +02:00
Laurent Destailleur
b74a0dd5fd Look and feel v6 2017-05-29 12:06:26 +02:00
Laurent Destailleur
3bf38d663f Merge pull request #6890 from defrance/patch-11 
menu descriptor must be only present in main
 2017-05-29 12:00:49 +02:00
KHELIFA
3402718425 Core Holiday: Add triggers for create, update and delete a holiday 
Fix the user parameter in the call of the create, update and delete functions of the class Holiday
 2017-05-29 11:58:16 +02:00
Laurent Destailleur
478349174c Merge pull request #6902 from aspangaro/6.0-salary 
NEW : Move employee in dol_banner in salaries
 2017-05-29 11:47:10 +02:00
Laurent Destailleur
d7cecef0f2 Merge pull request #6901 from aspangaro/6.0-d2 
Fix : Correct bank transfert when we write operation on general ledger
 2017-05-29 11:45:18 +02:00
Laurent Destailleur
cce05a4070 Merge branch 'develop' into 6.0-d2 2017-05-29 11:45:13 +02:00
Laurent Destailleur
ab5545d02d Merge pull request #6898 from defrance/patch-12 
$resaction need in 5.0.x too
 2017-05-29 11:41:22 +02:00