2
0
forked from Wavyzz/dolibarr
Commit Graph

10710 Commits

Author SHA1 Message Date
MDW
4f86b65f78 Fix PhanPluginRedundantAssignment 2024-03-13 01:03:56 +01:00
MDW
452b2600be Fix PhanPluginRedundantAssignment 2024-03-13 01:03:55 +01:00
MDW
e50f2028e4 Fix PhanPluginRedundantAssignment 2024-03-13 01:03:54 +01:00
MDW
c05221c879 Fix PhanPluginRedundantAssignment 2024-03-13 01:03:53 +01:00
MDW
a57d0915a2 Fix PhanPluginRedundantAssignment 2024-03-13 01:03:53 +01:00
MDW
bbe0368bbd Fix PhanPluginRedundantAssignment 2024-03-13 00:58:39 +01:00
MDW
439979a439 Fix PhanPluginRedundantAssignment 2024-03-13 00:58:38 +01:00
MDW
e073692e4d Fix PhanPluginRedundantAssignment 2024-03-13 00:58:37 +01:00
MDW
73b7cf9338 Fix PhanPluginRedundantAssignment 2024-03-13 00:58:37 +01:00
MDW
323c66216a Fix PhanPluginRedundantAssignment 2024-03-13 00:58:36 +01:00
MDW
5c09a7df85 Fix PhanPluginRedundantAssignment 2024-03-13 00:40:52 +01:00
Laurent Destailleur
04351f898d Merge pull request #28780 from gdesnoues/patch-1
show image in a line description of a proposal PDF #28670
2024-03-12 22:17:53 +01:00
Laurent Destailleur
54556b37fd Clean code 2024-03-12 21:59:29 +01:00
Laurent Destailleur
8c42ca11ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-12 21:24:34 +01:00
Laurent Destailleur
9807ed32e8 Update functions.lib.php 2024-03-12 21:09:23 +01:00
Laurent Destailleur
bf954e9cd7 Fix for compatibility 2024-03-12 21:04:20 +01:00
MDW
21e0bb4a76 Fix duplicate if condition (remove 2nd case with less effect 2024-03-12 20:00:58 +01:00
MDW
1f31d29a77 Fix duplicate if condition with same effect 2024-03-12 19:09:53 +01:00
MDW
29b8d0db84 Fix: Duplicate test on "shipping", replaced duplicate with delivery_note
# Fix: Duplicate test on "shipping", replaced duplicate with delivery_note

The second test on "shipping" was without effect but as the module was set to
"expedition_bon", I modified the test to delivery_note and put it closer to
the test on "shipping"
2024-03-12 19:05:15 +01:00
Laurent Destailleur
a6926c29c0 Merge pull request #28778 from fappels/develop_fix_delivery_note
Fix shipping is not a delivery_note (is sub module of shipping)
2024-03-12 14:53:51 +01:00
Laurent Destailleur
cc6fbef64d Update functions.lib.php 2024-03-12 14:44:48 +01:00
Laurent Destailleur
74b8162d22 Merge pull request #28700 from mdeweerd/urlencode/fixuptype
Fix: Ensure the argument type for urlencode is string
2024-03-12 14:43:41 +01:00
Laurent Destailleur
ee3fa7f643 Merge pull request #28776 from mdeweerd/fix/phpdoc1
Fix: PHPdoc and minor code changes from phpstan logs
2024-03-12 14:27:52 +01:00
Laurent Destailleur
53c3406d11 Merge branch 'develop' into fix_element_type_part_05 2024-03-12 14:22:25 +01:00
gdesnoues
c27f4e062f Merge branch 'develop' into patch-1 2024-03-12 14:19:56 +01:00
Laurent Destailleur
d62ef14064 Merge pull request #28768 from mdeweerd/fix/PhanTypeMismatchDeclaredParamNullable
Fix: PhanTypeMismatchDeclaredParamNullable & enable detection
2024-03-12 14:19:41 +01:00
Francis Appels
6f1b184f17 Merge remote-tracking branch 'Dolibarr/develop' into develop_fix_delivery_note 2024-03-12 14:13:41 +01:00
Laurent Destailleur
949c885477 Merge branch 'develop' into fix/phpdoc1 2024-03-12 14:11:30 +01:00
gdesnoues
a75bc08d94 show image in a line description of a proposal PDF #28670
When you set FCKEDITOR_ENABLE_DETAILS_FULL to 1 you can add pictures in description proposal with the WYSIWYG bar.
Add preg_replace() to show this pictures in the PDF
2024-03-12 14:08:29 +01:00
Francis Appels
ba1ca6dc7d module delivery_note not exist (no own module descriptor) is global MAIN_SUBMODULE_DELIVERY 2024-03-12 11:46:12 +01:00
Francis Appels
7ff68a5819 Fix shipping is not a delivery_note (sub module of shipping) 2024-03-12 11:07:18 +01:00
Frédéric FRANCE
d7517b5f20 Merge remote-tracking branch 'upstream/develop' into clean_mod_code 2024-03-12 09:25:53 +01:00
Laurent Destailleur
dcca7cc3f6 Better support for MAIN_OPTIMIZEFORTEXTBROWSER 2024-03-12 02:54:05 +01:00
Laurent Destailleur
56950673b8 Better support for MAIN_OPTIMIZEFORTEXTBROWSER 2024-03-12 02:41:47 +01:00
Laurent Destailleur
4f64c683ee Better support for MAIN_OPTIMIZEFORTEXTBROWSER 2024-03-12 01:55:26 +01:00
Frédéric France
7ad8f6b074 clean code and phpdoc 2024-03-11 23:18:01 +01:00
Frédéric France
7fabf59b46 clean code and phpdoc 2024-03-11 23:13:30 +01:00
MDW
6e5c4ef851 Fix PHPDoc date_m typo 2024-03-11 21:43:50 +01:00
John BOTELLA
9aaae61c9a Fix var 2024-03-11 16:49:46 +01:00
MDW
b7acea0ec4 Fix: PhanTypeMismatchDeclaredParamNullable notices
# Fix: PhanTypeMismatchDeclaredParamNullable notices

PHPDoc must indicate param is nullable if the default is null
with explicit typing.
(+Improved some other typing from generic Object to CommonObject).
2024-03-11 16:47:38 +01:00
Laurent Destailleur
93638f3980 Merge pull request #28667 from atm-john/fix_element_type_part_03
NEW : Factoring and Fix external module elementType limit - Part 03
2024-03-11 16:19:00 +01:00
Laurent Destailleur
38e67851bf Merge pull request #28747 from mdeweerd/test/security_dol_eval_ob_cleanup_on_exception
Fix: Ob buffer cleanup on exception
2024-03-11 16:17:14 +01:00
John BOTELLA
84ac33e1f5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_element_type_part_06 2024-03-11 16:14:28 +01:00
John BOTELLA
12ae786b0d Merge branch 'develop' into fix_element_type_part_05 2024-03-11 15:52:51 +01:00
terhoy
a8a2f0ff73 FIX: online signature partly fails if commercial proposal numbering contains a mask that’s includes a space (#28608) (#28742)
* FIX: online signature (#28608) Update signature.lib.php

If Commercial proposal numbering contains a mask that’s includes a space, that will affect the result of the online signature form. When generating the online signature form, the code in signature.lib.php line 77, will remove any existing space in the Commercial proposal numbering. The result is that the online signature form will miss data in field “Third-party” and “Amount”.

* FIX: online signature (#28608) Update payments.lib.php

If Commercial proposal numbering contains a mask that’s includes a space, that will affect the result of the online signature form. When generating the online signature form, the code in core/lib/payments.lib.ph, will remove any existing space in the Commercial proposal numbering.
2024-03-11 15:33:10 +01:00
Laurent Destailleur
41078a9a46 Merge branch 'develop' into test/security_dol_eval_ob_cleanup_on_exception 2024-03-11 14:57:33 +01:00
John BOTELLA
ed6874154d Merge branch 'develop' into fix_element_type_part_05 2024-03-11 14:33:48 +01:00
Laurent Destailleur
0f2121e3ba Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-11 13:46:08 +01:00
Laurent Destailleur
b7a246cedb Merge branch 'develop' into test/security_dol_eval_ob_cleanup_on_exception 2024-03-11 13:18:19 +01:00
MDW
dbfb1180ee Qual: Fix PhanPluginDuplicateIfStatements & remove exceptions (#28749)
# Qual: Fix PhanPluginDuplicateIfStatements & remove exceptions

Fix occurences of PhanPluginDuplicateIfStatements which are if statements where the
consecutive branches execute the same code, making it useles to test the condition
2024-03-11 12:58:51 +01:00