Commit Graph

30195 Commits

Author SHA1 Message Date
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
Laurent Destailleur
41f651265d
Merge pull request #23825 from Easya-Solutions/new-productlot-make-sell-or-eat-by-mandatory2
NEW can stay on edit field when errors occurs
2023-02-09 15:13:41 +01:00
Laurent Destailleur
3ee395e67b
Merge pull request #23827 from frederic34/patch-7
add count extrafields in admin dolresource
2023-02-09 15:10:31 +01:00
Laurent Destailleur
a352bcec5d
Merge pull request #23841 from avolani/16.0-FixODTFieldReplacement
Fix odt empty placeholder replacement
2023-02-09 14:59:23 +01:00
Laurent Destailleur
d61f301396
Merge pull request #23848 from frederic34/establishment
fix links
2023-02-09 14:46:59 +01:00
Laurent Destailleur
704faf734a NEW Auto activate some modules on install (export/import/wysiwyg editor) 2023-02-09 00:47:33 +01:00
Frédéric FRANCE
de31fb83f0 fix links 2023-02-08 23:33:39 +01:00
Frédéric FRANCE
eee645bb06 add ajax tooltip on opensurvey 2023-02-08 23:01:04 +01:00
avolani
f35d63cec1
Clean placeholder of missing related project and products 2023-02-08 16:41:06 +01:00
Laurent Destailleur
7d6db10710
Merge pull request #23658 from FliyFly/qodanaincompatiblereturn
Fix (qodana)
2023-02-08 16:06:25 +01:00
Frédéric FRANCE
39ec233138
add count extrafields in admin dolresource 2023-02-07 21:52:33 +01:00
Frédéric FRANCE
eef350d1d3 add ajax tooltip on dolresource 2023-02-07 21:44:39 +01:00
VESSILLER
6f8c26fa47 NEW can stay on edit field when errors occurs 2023-02-07 16:18:13 +01:00
Frédéric FRANCE
df411abe41 add ajax tooltip on task 2023-02-07 14:07:27 +01:00
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Frédéric FRANCE
769e28e3c0 clean code 2023-02-06 23:08:34 +01:00
Frédéric FRANCE
a224d7c824 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-06 20:57:49 +01:00
Laurent Destailleur
4b062847ff Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 19:28:11 +01:00
Théo David
7e15ea256f fix: socid post param on clicktodial add event button 2023-02-06 16:35:53 +01:00
Laurent Destailleur
2f8c4bd083 Fix label of var 2023-02-06 14:28:11 +01:00
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00
Frédéric FRANCE
1c24804f06 clean code 2023-02-06 14:14:15 +01:00
Laurent Destailleur
a35e8faa2f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-06 14:13:50 +01:00
Laurent Destailleur
22d3d9cef5 Fix warning when using MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL 2023-02-06 14:13:37 +01:00
Frédéric FRANCE
f699affba1 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-06 13:21:40 +01:00
Laurent Destailleur
ecddf3164d Fix phpunit 2023-02-06 03:41:15 +01:00
Laurent Destailleur
223765aecf Fix collapse/expand on extrafields 2023-02-06 03:36:52 +01:00
Laurent Destailleur
ffc9ab300b
Merge pull request #23780 from rycks/13_fix_update_public_note_error_when_document_model_not_found
13 fix update public note error when document model not found
2023-02-06 00:29:14 +01:00
Laurent Destailleur
806b2d9325
Merge pull request #23793 from frederic34/patch-7
add extrafields count in salary(ies) admin
2023-02-06 00:19:09 +01:00
Frédéric FRANCE
c77d2ba1c2 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-05 23:04:33 +01:00
Laurent Destailleur
437539ecb9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-02-05 22:50:12 +01:00
Laurent Destailleur
631168f56c NEW Collapse/Expand separators supported in edit and create mode 2023-02-05 22:37:24 +01:00
Frédéric FRANCE
89c5af14f4
add extrafields count in salary(ies) admin 2023-02-05 21:14:09 +01:00
Frédéric FRANCE
c0c10866e9 fix tooltip 2023-02-05 20:54:18 +01:00
Philippe GRAND
0633ead0e6 fix : Warning: Undefined array key delivery in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/sendings.lib.php on line 53 2023-02-05 18:05:03 +01:00
Frédéric FRANCE
83b4fde50c add ajax tooltip on salaries 2023-02-04 22:00:47 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Eric Seigne
1aaec5325f warnings is better than error 2023-02-04 17:21:13 +01:00
Eric Seigne
e04cd242b0 fix #21072: error message if deocument model not found 2023-02-04 17:12:09 +01:00
Laurent Destailleur
c7b812a596
Merge pull request #23734 from Easya-Solutions/develop_new_commande_shipment_method_export
NEW Order export : allow to export field 'shipment method'.
2023-02-04 16:58:20 +01:00
kkhelifa
2c826a4fcc FIX: Remove orphelan $this->db->rollback() in the function insertExtrafields() 2023-02-04 16:15:18 +01:00
kkhelifa
05a0c775b6 FIX: Remove orphelan $this->db->rollback() in the function insertExtrafields() 2023-02-04 16:13:23 +01:00
Laurent Destailleur
cd8db1c60d
Merge pull request #23748 from OPEN-DSI/develop_fix_insert_extra_fields_on_link_type_when_error
FIX: Remove orphelan $this->db->rollback() in the function insertExtrafields()
2023-02-04 16:12:34 +01:00
Sylvain Legrand
18708dfdee Fix input for progress not shown on lines in edit mode 2023-02-04 15:42:00 +01:00
Laurent Destailleur
4d2dcf54c8
Merge pull request #23757 from SylvainLegrand/Fix_show_progress_imput_on_edit_line
Fix input for progress not shown on lines in edit mode
2023-02-04 15:41:10 +01:00
Laurent Destailleur
d3a26efb0e
Merge pull request #23755 from frederic34/patch-4
fix #23753
2023-02-04 15:39:01 +01:00
Laurent Destailleur
374a3e4cfb
Merge pull request #23756 from frederic34/patch-7
doc
2023-02-04 15:38:41 +01:00
jyhere
ecadaf9666 [FIX] sellist / chkboxlist extrafields error when table is _extrafields
This patch fixes error when an sellist /chkboxlist extrafield directly use an *_extrafields table (as main table)
2023-02-04 15:27:08 +01:00