Commit Graph

72072 Commits

Author SHA1 Message Date
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
gauthier
d62118dca8 FIX : langs fr 2018-09-19 14:53:56 +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
Laurent Destailleur
cde023148a
Merge pull request #9121 from yolocodefrench/develop
Generation of the mandate file from the api
2018-09-19 14:47:25 +02:00
Laurent Destailleur
f240cd130d
Update api_thirdparties.class.php 2018-09-19 14:47:11 +02:00
Laurent Destailleur
019ba74225
Update api_thirdparties.class.php 2018-09-19 14:44:16 +02:00
Laurent Destailleur
d6bd0ed73e
Merge pull request #9566 from frederic34/patch-9
call to deprecated add_object_linked was present two times
2018-09-19 14:37:05 +02:00
Laurent Destailleur
a6996169d6
Merge pull request #9565 from frederic34/multicpdf
correct typo in multicurrency doc pdf #9562
2018-09-19 14:30:15 +02:00
Laurent Destailleur
818098a57e
Merge pull request #9563 from grandoc/develop
Standardize and update code
2018-09-19 14:29:29 +02:00
Laurent Destailleur
9d0594c0b4
Merge pull request #9559 from frederic34/ccharges
correct trimParameters
2018-09-19 14:29:10 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018
Standardize and update code
2018-09-19 14:26:28 +02:00
Laurent Destailleur
7ca6b2603c Trans 2018-09-19 12:25:07 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Philippe GRAND
3126191ae5 Standardize and update code 2018-09-19 08:46:43 +02:00
Laurent Destailleur
d35687c8b3 Work on module social network 2018-09-19 01:45:56 +02:00
Laurent Destailleur
2ec02afa8b Fix nb of module 2018-09-19 01:14:55 +02:00
Laurent Destailleur
85180b117c Fix warnings 2018-09-18 23:48:02 +02:00
Laurent Destailleur
c56b02c1c4 Fix warning 2018-09-18 23:47:55 +02:00
Laurent Destailleur
86bc1c813c Fix warnings 2018-09-18 23:45:22 +02:00
Laurent Destailleur
7dba51c9a8 Fix warning 2018-09-18 23:39:49 +02:00
Laurent Destailleur
79b248fc67 FIX warning picto when next run date passed 2018-09-18 23:27:26 +02:00
Laurent Destailleur
8a43fe22cc FIX warning picto when next run date passed 2018-09-18 23:25:38 +02:00
Frédéric FRANCE
126e5ae3ad
remove not needed require 2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5
correct trimParameters 2018-09-18 19:05:00 +02:00
Laurent Destailleur
014da6c22c Fix translation 2018-09-18 18:11:07 +02:00
Philippe GRAND
e828131fb2 Standardize and update code 2018-09-18 17:42:38 +02:00
Philippe GRAND
83871468ba Standardize and update code 2018-09-18 17:37:08 +02:00
Philippe GRAND
4536993fdc Standardize and update code 2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b Standardize and update code 2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a Standardize and update code 2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af Standardize and update code 2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3 Standardize and update code 2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2 Standardize and update code 2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231 Standardize and update code 2018-09-18 16:49:20 +02:00
Philippe GRAND
71d8356f6a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018 2018-09-18 16:48:32 +02:00
Laurent Destailleur
58e82008ac Prepare 8.0.2 2018-09-18 16:45:08 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Philippe GRAND
4a15c7b158 fix merge 2018-09-18 16:42:13 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d fix merge 2018-09-18 16:38:14 +02:00
Laurent Destailleur
e2e3354807 Clean code 2018-09-18 16:35:38 +02:00
John BOTELLA
3fb2d4c159 remove change on text 2018-09-18 15:52:57 +02:00
Laurent Destailleur
4580ed0b09 Fix bad link 2018-09-18 15:31:25 +02:00
Laurent Destailleur
24279b71ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-18 15:29:01 +02:00
Laurent Destailleur
d98000c547
Merge branch 'develop' into new_branch_18_09_2018 2018-09-18 15:20:26 +02:00
Laurent Destailleur
34c130e715
Merge pull request #9551 from frederic34/patch-27
clean html donateur_code.php
2018-09-18 15:19:27 +02:00