lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,411 Commits 43 Branches 150 Tags 886 MiB
426835781a
Commit Graph

46411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
702c19dab3 Refactored function getBrowserInfo 2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
aspangaro
067af47955 Add accountancy field on creation mode and correct rowspan. 2015-02-22 08:35:25 +01:00
aspangaro
4bb524d55d Also for edit user. 2015-02-22 08:12:40 +01:00
aspangaro
ce247432ee FIXED: Remove condition to show accountancy field on user. 2015-02-22 08:05:23 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
frederic34
ad3e91dc9f WIP 2015-02-21 14:06:33 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
d2da098336 Fixed example 2015-02-21 10:00:31 +01:00
Laurent Destailleur
2b045ba74a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 09:52:59 +01:00
Laurent Destailleur
2b4f7a41bf Merge pull request #2377 from aspangaro/develop-patch5 
NEW: Update PHPExcel library to 1.8.0
 2015-02-21 00:22:21 +01:00
Laurent Destailleur
6e66197621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-20 23:49:06 +01:00
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Laurent Destailleur
03751d61f2 Merge pull request #2376 from aspangaro/develop-patch4 
Update FPDI library to 1.5.2
 2015-02-20 23:46:33 +01:00
Laurent Destailleur
7681e238be Merge pull request #2372 from frederic34/patch-2 
Update account.class.php
 2015-02-20 23:35:15 +01:00
Laurent Destailleur
d9ab05833f Merge pull request #2370 from braito4/patch-1 
[FIX #1833] Permissions in contact/note.php wrong
 2015-02-20 23:31:55 +01:00
Laurent Destailleur
6952f33309 Restore data into bannner of thirdparty to have content matching other 
tabs.
 2015-02-20 23:29:55 +01:00
Laurent Destailleur
9ac38dee45 Merge pull request #2367 from marcosgdf/bug-1652 
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
 2015-02-20 23:27:53 +01:00
Laurent Destailleur
29c39d61fb Merge branch 'marcosgdf-bug-1790' into 3.6 2015-02-20 23:24:05 +01:00
Laurent Destailleur
56635cea98 Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1790

Conflicts:
	ChangeLog
 2015-02-20 23:23:57 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
f423386518 Sync lang 2015-02-20 20:20:12 +01:00
Laurent Destailleur
bd6b465ee1 Add phpunit for ie11 and ie10 2015-02-20 20:16:15 +01:00
Laurent Destailleur
e1e31de229 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-20 20:15:04 +01:00
Laurent Destailleur
d549c00b2e Merge pull request #2365 from marcosgdf/3.5 
Fix: [ bug #1846 ] Browser IE11 not detected
 2015-02-20 20:02:11 +01:00
Laurent Destailleur
e13393da9a Merge pull request #2364 from daamien/patch-2 
FIX [ bug #1314 ] [Bank] num_releve is not incremented correctly in releve.php
 2015-02-20 18:58:10 +01:00
Laurent Destailleur
c80f9a59be Merge pull request #2381 from mrsof/patch-1 
FIX: Unknown field 'sc.fk_soc' in field list
 2015-02-20 18:40:29 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Sof
ba80bbb291 FIX; Unknown field 'sc.fk_soc' in field list 2015-02-20 17:33:58 +01:00
Laurent Destailleur
dba050fd43 Fix: tags h correctly supported 2015-02-20 15:55:55 +01:00
Laurent Destailleur
49cb36461c Typo 2015-02-20 15:54:16 +01:00
Laurent Destailleur
dec277f30f Accept h tags 2015-02-20 15:53:19 +01:00
Laurent Destailleur
41196c01e9 Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not 
accepting all html tags from templates.
 2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
d46c76311c Correction 2015-02-20 10:23:17 +01:00
Marcos García de La Fuente
3a917a0d1f Merge branch '3.6' into bug-1825 2015-02-20 10:19:08 +01:00
Marcos García de La Fuente
fd18aa8717 Better fix for Bug #1825 2015-02-20 10:17:02 +01:00
Maxime Kohlhaas
2547d96ffd New : Use supplier default payment terms when creating a replenish order 2015-02-20 09:26:53 +01:00
Maxime Kohlhaas
504cc89078 New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order 2015-02-20 09:24:33 +01:00
aspangaro
0f08544557 Update TCPDF library to 6.2.6 2015-02-20 06:05:50 +01:00
aspangaro
50990bc862 Update PHPExcel library to 1.8.0 2015-02-20 05:50:36 +01:00
aspangaro
0205848a0e Update FPDI library to 1.5.2 
Contain FPDF_TPL natively
 2015-02-20 05:21:18 +01:00
aspangaro
014f255f22 Update FPDF_TPL library to 1.2.3 2015-02-20 05:09:07 +01:00
aspangaro
9be3e79a72 Align the version of AdoDb-Date library 2015-02-20 05:01:44 +01:00
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Florian HENRY
4ba2a1344e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-19 10:15:57 +01:00
Florian HENRY
99153915dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-19 10:09:38 +01:00
Laurent Destailleur
cb32dbc7b8 Merge branch 'marcosgdf-bug-1825' into 3.6 2015-02-19 09:47:35 +01:00