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

66620 Commits

Author SHA1 Message Date
Laurent Destailleur
aa93e1c07b
Merge pull request #11221 from frederic34/patch-6 
The method _load_ldap_dn() cannot be called...
 2019-05-21 22:39:15 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
5707aff7c4 Look and feel v10 2019-05-21 21:52:04 +02:00
Laurent Destailleur
a93cbd4320 FIX Look and feel v10 2019-05-21 21:47:25 +02:00
Laurent Destailleur
c3b9c08219 CSS 2019-05-21 21:36:48 +02:00
Laurent Destailleur
fdeb12a909 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/card.php
 2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Laurent Destailleur
bfa4483722 More robust test against sql injections 2019-05-21 17:41:41 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
0415edb8cd Fix phpcs 2019-05-21 16:17:32 +02:00
Laurent Destailleur
2c0c1dbef3 Debug modulebuilder 2019-05-21 16:16:19 +02:00
Laurent Destailleur
657bd5c2fe Move module from develop to experimental 2019-05-21 15:50:16 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
 2019-05-21 15:13:25 +02:00
Laurent Destailleur
5131e7a5b7 Fix SQL injection 2019-05-21 14:39:38 +02:00
Laurent Destailleur
bea4647107 Fix auto swith on utf8 when using utf8mb4 2019-05-21 14:36:16 +02:00
Laurent Destailleur
61ead06950 Fix Injection 2019-05-21 14:35:05 +02:00
Laurent Destailleur
479f8616e1 Fix sanitize data 2019-05-21 14:03:28 +02:00
Laurent Destailleur
f283e24b48 Fix the noexe must be added for dangerous extension like js and shells 2019-05-21 13:53:12 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
54441a1abd Fix css 2019-05-21 12:36:18 +02:00
Laurent Destailleur
6365c7cd00 Bad cut and paste 2019-05-21 12:17:07 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
Laurent Destailleur
2a2fcf6784 FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6. 2019-05-20 15:38:33 +02:00
Laurent Destailleur
321544b3fa Fix phpcs 2019-05-20 15:25:39 +02:00
Laurent Destailleur
ec922d3d17 Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF 2019-05-20 14:54:09 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
83c369cc0f Add $array_to_check for property in invoice instead of thirdparty 2019-05-20 13:02:33 +02:00
Laurent Destailleur
91dd8a71d3 Fix syntax error 2019-05-20 12:50:00 +02:00
Laurent Destailleur
827a2e1809 Fix test if qualified for stock change at wrong place 2019-05-20 12:47:02 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
6780befb2d Fix css 2019-05-19 21:59:03 +02:00
Laurent Destailleur
c92994f7ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-19 19:15:28 +02:00
Laurent Destailleur
e84e3ef01f Move module into external module 2019-05-19 19:15:18 +02:00
Laurent Destailleur
27ed095181 Debug BOM module 2019-05-19 16:40:25 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
2900f8828a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 13:52:28 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Frédéric FRANCE
a368a6a43e
Update adherent_type.class.php 2019-05-19 11:52:34 +02:00
Frédéric FRANCE
a09584ae4b
The method _load_ldap_dn() cannot be called... 
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
 2019-05-19 09:46:47 +02:00
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php 2019-05-19 09:15:51 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
Frédéric FRANCE
7d66cc1ab1
Update agenda.php 2019-05-19 09:14:29 +02:00
Frédéric FRANCE
06421c200d
Update agenda.php 2019-05-19 09:13:46 +02:00
Frédéric FRANCE
19085ed200
dol_print_object_info return void 2019-05-19 09:08:59 +02:00
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135 
FIX #11135
 2019-05-19 02:23:49 +02:00