Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,166 Commits 36 Branches 189 Tags
ee152947dba2d1ca7772cc962bfc5242cb15a6df
Commit Graph

30544 Commits

Author SHA1 Message Date
Laurent Destailleur
7c4858fdc3 Add page with help for ingoing email setup 2023-02-07 11:05:09 +01:00
marcusdeangabriel
83b76ddfd9 Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-07 08:23:48 +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
394c3f847c FIX clicktodial backtopage 2023-02-06 17:03:51 +01:00
Théo David
7e15ea256f fix: socid post param on clicktodial add event button 2023-02-06 16:35:53 +01:00
marcusdeangabriel
a004f8b62c Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 16:24:01 +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
hystepik
72fc4c1d0b add nologin 2023-02-06 12:24:19 +01:00
mgabriel
b8cd507287 As suggested by Dolibarr, removed PROPALE_MODIFY_MARGIN_RATES as not needed. 2023-02-06 10:06:23 +01:00
marcusdeangabriel
f974295a45 Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 09:10:43 +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
Laurent Destailleur
744be1d20a Merge pull request #23765 from jyhere/jyhere-fix-tablelistextrafields 
[FIX] sellist / chkboxlist extrafields error when table is _extrafields
 2023-02-04 15:26:10 +01:00
Laurent Destailleur
70c6ce9bfb Enhance error catching on dol_eval 2023-02-04 15:21:32 +01:00
Rept0id
3cc415af47 Updated function dol_eval, added error handling 
- There were cases that dol_eval() would break the whole system.

-That was happening in case of using a new version plugin on an old version dolibarr. New plugin validates through isModActive() instead of $conf->moduleName->enabled. Even if you were deactivating the plugin, or totally delete it, the records were still on database for menu, so there were no obvious solution. This update adds a backwards compatibility, makes doli more stable and counterparts the use of eval, making it more safe.

- Use of eval is not bad, as well there are techniques in any project that are project-related useful and smart. For example, Linux kernel uses GOTO. But in such cases, there needs to be a safety net.

-I found out this after a lot of trouble, I hope this small fix will save other developers.

👍
 2023-02-04 15:17:51 +01:00
Laurent Destailleur
57e003a7f5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-04 15:17:01 +01:00
Laurent Destailleur
53b64feb7b Merge pull request #23760 from rept0id/develop 
Fix : Updated function dol_eval, added error handling
 2023-02-04 15:16:38 +01:00
Laurent Destailleur
0a2d236c4e Merge pull request #23773 from DethCount/patch-3 
FIX Division by zero
 2023-02-04 15:06:03 +01:00
Laurent Destailleur
acef9f674f Merge pull request #23779 from grandoc/new_branch_04_02_2023 
fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/a…
 2023-02-04 15:01:23 +01:00