Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
76,036 Commits 35 Branches 179 Tags 1.7 GiB
2c0c1dbef3
Commit Graph

66600 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135 
FIX #11135
 2019-05-19 02:23:49 +02:00
Laurent Destailleur
4b3d0ed50c
Update user.class.php 2019-05-19 02:21:42 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
florian HENRY
7f8c118466 fix: #11015 2019-05-19 01:52:50 +02:00
florian HENRY
272b5f7d6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-19 01:52:14 +02:00
Laurent Destailleur
32485c2782 Fix phpcs 2019-05-19 01:45:33 +02:00
Laurent Destailleur
a4cea5b877 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 01:41:53 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm 
Fix edit admin status of another admin
 2019-05-19 01:41:42 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00