lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,667 Commits 43 Branches 150 Tags 886 MiB
c2e2395415
Commit Graph

69667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe GRAND
c2e2395415 Comment and typo 2018-09-21 09:18:12 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Philippe GRAND
e8b7ad0fb5 Standardize and update code 2018-09-21 08:49:05 +02:00
Laurent Destailleur
160e97616b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-20 23:43:51 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
37dcb33661 phpunit for Loan 2018-09-20 23:41:04 +02:00
Laurent Destailleur
5a0ffb68d7
Merge pull request #9576 from atm-john/FIX_attribute_closing 
FIX attribute closing
 2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles 
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
 2018-09-20 19:45:46 +02:00
Laurent Destailleur
eb80c5c338 Fix translation not loaded and test on multicompany 2018-09-20 19:45:13 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
e6a5c99b71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-20 19:35:24 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Laurent Destailleur
4ab6155b07
Merge pull request #9545 from ptibogxiv/patch-64 
Fix link display
 2018-09-20 19:27:00 +02:00
Laurent Destailleur
b421c29ea7 FIX #9510 2018-09-20 19:20:15 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Laurent Destailleur
c55ebecff7 Include PHP unit of Loan class into Travis 2018-09-20 19:06:12 +02:00
Laurent Destailleur
9fc08c45cf
Merge pull request #9575 from atm-maxime/new_phpunit_loan 
NEW PHPUnitTest on Loan class #3163
 2018-09-20 19:00:26 +02:00
Laurent Destailleur
1601583fe2
Merge pull request #9574 from atm-john/NEW_task_selection_on_event_form 
NEW : can add project's task to agenda on create event form
 2018-09-20 18:59:18 +02:00
Philippe GRAND
67bbead7c1 Standardize and update code 2018-09-20 17:46:39 +02:00
Philippe GRAND
9c9f5bd3c3 Standardize and update code 2018-09-20 17:26:39 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498 Standardize and update code 2018-09-20 17:11:29 +02:00
Philippe GRAND
ef95be1ed7 Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018 2018-09-20 17:10:48 +02:00
Laurent Destailleur
6ea7a6bce7 Try some fix to generate mandate 2018-09-20 17:09:31 +02:00
Philippe GRAND
e64fbd9522 Standardize and update code 2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9 Standardize and update code 2018-09-20 16:58:34 +02:00
Philippe GRAND
43edc64e7f Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018 2018-09-20 16:57:10 +02:00
Laurent Destailleur
e0dfab4c71 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:36 +02:00
Laurent Destailleur
c6470d49b0 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:08 +02:00
John BOTELLA
b59b0b0cc3 FIX attribute closing 2018-09-20 16:13:22 +02:00
Philippe GRAND
6f18992bcc Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018 2018-09-20 15:16:33 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Laurent Destailleur
497ab37204 css 2018-09-20 15:11:26 +02:00
Philippe GRAND
92a484dcd9 Standardize and update code 2018-09-20 15:07:43 +02:00
Laurent Destailleur
8793b9e26a css 2018-09-20 15:07:42 +02:00
Maxime Kohlhaas
75104999d3 NEW PHPUnitTest on Loan class #3163 2018-09-20 15:04:00 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3 Standardize and update code 2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79 Standardize and update code 2018-09-20 14:43:54 +02:00
Laurent Destailleur
6793285997 Website 2018-09-20 14:38:18 +02:00
Laurent Destailleur
6e95fb5f05 Warning in website module 2018-09-20 14:36:13 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2 Standardize and update code 2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba Standardize and update code 2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667 Standardize and update code 2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88 Standardize and update code 2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00