Commit Graph

69616 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
6ea7a6bce7 Try some fix to generate mandate 2018-09-20 17:09:31 +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
Laurent Destailleur
497ab37204 css 2018-09-20 15:11:26 +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
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
Laurent Destailleur
9e01ea9180 css 2018-09-20 12:04:27 +02:00
John BOTELLA
83d3e5ec39 NEW : can add project's task to agenda on create event card 2018-09-20 10:17:43 +02:00
Laurent Destailleur
d4ffc5e088 css 2018-09-20 00:48:00 +02:00
Laurent Destailleur
4ca5bd696d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-19 20:28:27 +02:00
ptibogxiv
1a841b48ae
Update transaction.php 2018-09-19 20:15:12 +02:00
Laurent Destailleur
a546ef7f2d FIX default day 2018-09-19 20:01:25 +02:00
Laurent Destailleur
76b6a88db6
Merge pull request #9570 from frederic34/patch-9
remove superfluous spaces
2018-09-19 19:21:14 +02:00
ptibogxiv
203a2291ba
Update transaction.php 2018-09-19 19:05:46 +02:00
ptibogxiv
7e0bad97eb
Update transaction.php 2018-09-19 18:59:32 +02:00
Frédéric FRANCE
237f888356
Update api_thirdparties.class.php 2018-09-19 18:47:59 +02:00
Frédéric FRANCE
9ee88e9d35
remove superfluous spaces 2018-09-19 18:33:11 +02:00
Laurent Destailleur
19ec5103ad css 2018-09-19 18:06:36 +02:00
Laurent Destailleur
55e3d97842 Trans 2018-09-19 17:56:51 +02:00
Laurent Destailleur
22053e0f4d CSS 2018-09-19 17:53:24 +02:00
Laurent Destailleur
09a41fd757 Look and feel v8 2018-09-19 17:33:50 +02:00
Laurent Destailleur
92aa6929de Fix go back on agenda view on correct page 2018-09-19 17:03:13 +02:00
Laurent Destailleur
12b449fe49 It's easier to select fields to show on list 2018-09-19 16:41:33 +02:00
Laurent Destailleur
ee788b543e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-19 15:06:42 +02:00
Laurent Destailleur
1d47569651 Brighter gradient 2018-09-19 15:06:14 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2018-09-19 15:03:24 +02:00
Laurent Destailleur
9b190d2cbc
Merge pull request #9201 from atm-quentin/FIX_select_element
FIX exclude element of the select
2018-09-19 14:55:31 +02:00
Laurent Destailleur
dc7c27b162 Release 8.0.2 2018-09-19 14:53:39 +02:00
Laurent Destailleur
02617bd799 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-19 14:53:07 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-09-19 14:52:43 +02:00