Commit Graph

1573 Commits

Author SHA1 Message Date
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966 Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
1ede8a30b2 Missing NOSESSION 2022-02-16 17:49:05 +01:00
Laurent Destailleur
69266ae61f Fix text 2022-02-16 14:14:30 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
ce1a08baf6 Fix phpcs 2022-02-09 16:59:40 +01:00
Laurent Destailleur
47800aebfa Fix phpunit and mode save after opening a ref 2022-02-09 15:21:25 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
2991f992dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:28:30 +01:00
Laurent Destailleur
cd491280cf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
ATM john
ba46d04d6e Fix logic for form setup 2022-02-04 21:51:33 +01:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
ba6033da8e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
2022-01-04 09:38:11 +01:00
Laurent Destailleur
ce05130384 Typo 2022-01-03 04:01:02 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
fdf7749a54 Merge pull request #19508 from atm-john/fix_missing_formsetup_elements
Fix missing formsetup elements
2021-12-16 18:42:55 +01:00
Laurent Destailleur
2fc51b9758 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 17:21:04 +01:00
Laurent Destailleur
30107837a5 Merge pull request #19588 from Hystepik/develop#2
Fix php 8.0 warnings of modulebuilder
2021-12-09 17:19:42 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Laurent Destailleur
9462481e83 Doc 2021-12-09 14:51:35 +01:00
Philippe Grand
6d89e4b199 Update mymodulewidget1.php 2021-12-04 15:23:21 +01:00
stickler-ci
9465fc17e6 Fixing style errors. 2021-12-04 14:20:38 +00:00
Philippe GRAND
30505cc564 update code : use loadlangs function 2021-12-04 15:19:45 +01:00
ATM john
f640a9fbad Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements 2021-12-04 13:59:27 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
ATM john
a75ae6a8cf Fix missing formsetup elements 2021-11-28 12:11:03 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
5af241371a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-11-15 12:32:09 +01:00
Laurent Destailleur
cd2a09de42 Merge pull request #19170 from atm-john/new_setup_form_help_class
NEW : setup form class to help setup page creation
2021-11-15 12:12:25 +01:00
Laurent Destailleur
dbdf34c7da Update setup.php 2021-11-15 12:09:58 +01:00
Laurent Destailleur
f7d9975b66 Update setup.php 2021-11-15 12:00:37 +01:00
Laurent Destailleur
74e30f292c Update setup.php 2021-11-15 11:58:48 +01:00
Laurent Destailleur
83cb6b6753 Update setup.php 2021-11-15 11:54:08 +01:00