Philippe GRAND
|
9fab0a1d45
|
Update comments
|
2018-09-21 14:16:22 +02:00 |
|
Philippe GRAND
|
de6fca0844
|
fix merging
|
2018-09-21 14:09:12 +02:00 |
|
Philippe GRAND
|
48c3a1e1bc
|
fix merging
|
2018-09-21 14:06:55 +02:00 |
|
Philippe Grand
|
d5003c9d3c
|
Merge branch 'develop' into new_branch_21_09_2018
|
2018-09-21 13:55:04 +02:00 |
|
Laurent Destailleur
|
7ece28ffd3
|
Trans
|
2018-09-21 11:48:01 +02:00 |
|
Laurent Destailleur
|
3be13f0cb6
|
Fix css
|
2018-09-21 11:45:04 +02:00 |
|
Laurent Destailleur
|
0abe05c6b7
|
Fix no form inside a table
|
2018-09-21 11:29:01 +02:00 |
|
Laurent Destailleur
|
e2a9bf3a83
|
Merge pull request #9586 from frederic34/patch-9
correct link to setup modulebuilder
|
2018-09-21 11:18:21 +02:00 |
|
Laurent Destailleur
|
ac8f82338e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-21 11:12:27 +02:00 |
|
Frédéric FRANCE
|
7434b076d8
|
correct link to setup modulebuilder
|
2018-09-21 11:12:19 +02:00 |
|
Laurent Destailleur
|
a078951a94
|
Add an help for user to avoid bad configuration
|
2018-09-21 11:12:08 +02:00 |
|
Laurent Destailleur
|
90b327af1d
|
Merge pull request #9584 from ptibogxiv/patch-54
fix link with connect transaction.php
|
2018-09-21 09:59:57 +02:00 |
|
Laurent Destailleur
|
486a6fdc3a
|
Merge pull request #9583 from ptibogxiv/patch-65
fix link in connect mode charge.php
|
2018-09-21 09:58:51 +02:00 |
|
ptibogxiv
|
60cb83cf25
|
Update transaction.php
|
2018-09-21 09:55:24 +02:00 |
|
ptibogxiv
|
d09b74abe5
|
Update transaction.php
|
2018-09-21 09:54:07 +02:00 |
|
ptibogxiv
|
933f253c86
|
Update transaction.php
|
2018-09-21 09:52:27 +02:00 |
|
ptibogxiv
|
61d0aa66a5
|
Update transaction.php
|
2018-09-21 09:52:08 +02:00 |
|
ptibogxiv
|
d544f0598b
|
fix link in connect mode
|
2018-09-21 09:50:31 +02:00 |
|
Laurent Destailleur
|
8cfe5d7252
|
Merge pull request #9569 from grandoc/new_branch_19_09_2018
Missing translation
|
2018-09-21 09:50:18 +02:00 |
|
ptibogxiv
|
d0fafe8f0f
|
fix link with connect transaction.php
|
2018-09-21 09:49:13 +02:00 |
|
Laurent Destailleur
|
21f959746f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-21 09:42:44 +02:00 |
|
Laurent Destailleur
|
0073d63464
|
Fix phpcs
|
2018-09-21 09:42:33 +02:00 |
|
Laurent Destailleur
|
f7392871dd
|
Merge pull request #9579 from frederic34/patch-9
remove warning Line exceeds 500 characters
|
2018-09-21 09:40:28 +02:00 |
|
Philippe GRAND
|
bde8d8ae0e
|
Comment and typo
|
2018-09-21 09:32:50 +02:00 |
|
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 |
|
Frédéric FRANCE
|
042555e716
|
remove warning Line exceeds 500 characters
|
2018-09-20 20:44:17 +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 |
|