Commit Graph

129972 Commits

Author SHA1 Message Date
Vincent Maury
e89f93024f NEW #24031 add option MAIN_GRANDTOTAL_LIST_SHOW to always show grand total to lists (#27247)
* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option selected - grand total to lists

* Update ihm.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 05:34:45 +01:00
Laurent Destailleur
200fd95074 NEW All apis has a hook context of "api" initialized 2024-02-12 05:25:45 +01:00
Laurent Destailleur
474064c18a Merge branch 'cashdiscounthooks' of github.com:bloxera/dolibarr into
develop

# Conflicts:
#	htdocs/compta/facture/class/api_invoices.class.php
#	htdocs/compta/facture/list.php
#	htdocs/fourn/class/api_supplier_invoices.class.php
#	htdocs/fourn/facture/list.php
2024-02-12 05:04:33 +01:00
Laurent Destailleur
437bbc9064 Close #27068 2024-02-12 04:21:24 +01:00
Laurent Destailleur
9a1afee6d2 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-12 03:36:46 +01:00
Laurent Destailleur
f6dd2f808e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-12 03:35:51 +01:00
Laurent Destailleur
ff2d609814 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_production.php
2024-02-12 03:35:39 +01:00
Laurent Destailleur
2e620c9a43 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-12 03:33:09 +01:00
Laurent Destailleur
65533360a2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/main.inc.php
2024-02-12 03:32:58 +01:00
MDW
60f15baef2 Qual: Backport: pre-commit php-cs with cache (#28123)
* Qual: Lower severity on php-cs messages that should not block (#28072)

# Qual: Lower severity on php-cs messages that should not block

Some warning messages result in php-cs having an exit code of 2 and others
only have an exit ocde of 1.  When the exit code is 2, the warnings are fixable
by php-cbf.

In order to be able to filter on the warnings in the github ci flow, but still
show them in the travis flow, I lower the level of the warnings that should not
be blocking to 4.

At the same time, the php-cs configuration in pre-commit now requires that the
severity is minimum 5 to show the message (level 5 is the default for all warnings
and errors).

So this will limit the warning messages to the ones that should result in a failing
ci action.  If any new cases are discovered, they should also be lowered in the
php-cs configuration file.

* Qual: ci: Run pre-commit/php-cs with cache (#28079)

This adds a hook to .pre-commit-config.yaml and updates the workflow
to run php-cs with cache when it is run for all files.
When running on changed files only, the cache is not useful.

The php-codesniffer ruleset.xml was cleaned up (duplicates removal/formatted)
2024-02-12 03:30:19 +01:00
thibdrev
838f706e5e qual: phpstan for htdocs/holiday/class/holiday.class.php (#28117)
htdocs/holiday/class/holiday.class.php	94	Property Holiday::$date_valid (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	114	Property Holiday::$date_refuse (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	124	Property Holiday::$date_cancel (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	1603	Method Holiday::getConfCP() should return string but returns int.
htdocs/holiday/class/holiday.class.php	1614	Method Holiday::getConfCP() should return string but returns int.
htdocs/holiday/class/holiday.class.php	1797	Method Holiday::getCPforUser() should return float but returns null.
htdocs/holiday/class/holiday.class.php	1800	Method Holiday::getCPforUser() should return float but returns null.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 03:22:15 +01:00
thibdrev
18c023b983 qual: phpstan for htdocs/variants/class/ProductAttribute.class.php (#27985)
htdocs/variants/class/ProductAttribute.class.php	1401	Parameter #7 $seller (string) of method ProductAttribute::printObjectLine() should be compatible with parameter $seller (Societe) of method CommonObject::printObjectLine()
htdocs/variants/class/ProductAttribute.class.php	1401	Parameter #8 $buyer (string) of method ProductAttribute::printObjectLine() should be compatible with parameter $buyer (Societe) of method CommonObject::printObjectLine()

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 03:17:47 +01:00
Laurent Destailleur
a2d2247d0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-12 02:52:52 +01:00
Laurent Destailleur
1caf853528 Work on website templates from modules 2024-02-12 02:52:35 +01:00
thibdrev
d44172c311 qual: phpstan for htdocs/compta/bank/various_payment/card.php (#28113)
htdocs/compta/bank/various_payment/card.php	121	Property PaymentVarious::$amount (float) does not accept string.
htdocs/compta/bank/various_payment/card.php	129	Property PaymentVarious::$category_transaction (int) does not accept array|string.
htdocs/compta/bank/various_payment/card.php	293	Property PaymentVarious::$amount (float) does not accept string.
htdocs/compta/bank/various_payment/card.php	295	Property PaymentVarious::$amount (float) does not accept string.
2024-02-12 02:12:24 +01:00
thibdrev
9dbfb1de46 qual: phpstan for htdocs/compta/bank/class/paymentvarious.class.php (#28114)
htdocs/compta/bank/class/paymentvarious.class.php	241	Property PaymentVarious::$amount (float) does not accept string.

htdocs/compta/bank/class/paymentvarious.class.php	459	Property PaymentVarious::$amount (float) does not accept string.
2024-02-12 02:11:28 +01:00
thibdrev
d425938000 qual: phpstan for htdocs/compta/sociales/class/paymentsocialcontribution.class.php (#28115)
htdocs/compta/sociales/class/paymentsocialcontribution.class.php	539	Property PaymentSocialContribution::$fk_typepaiement (int) does not accept string.
2024-02-12 02:11:08 +01:00
thibdrev
c6dfdf8791 qual: phpstan for htdocs/intracommreport/class/intracommreport.class.php (#28118)
htdocs/intracommreport/class/intracommreport.class.php	193	Method IntracommReport::getXML() should return int|SimpleXMLElement but returns string|false.
htdocs/intracommreport/class/intracommreport.class.php	225	Method IntracommReport::getXMLDes() should return int|SimpleXMLElement but returns string|false.
htdocs/intracommreport/class/intracommreport.class.php	466	Method IntracommReport::getNextDeclarationNumber() should return string but returns (float|int).
2024-02-12 02:09:49 +01:00
thibdrev
e8ed3f3ec4 qual: phpstan for htdocs/holiday/class/holiday.class.php (#28120)
htdocs/holiday/class/holiday.class.php	94	Property Holiday::$date_valid (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	114	Property Holiday::$date_refuse (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	124	Property Holiday::$date_cancel (int) does not accept default value of type string.
htdocs/holiday/class/holiday.class.php	1603	Method Holiday::getConfCP() should return string but returns int.
htdocs/holiday/class/holiday.class.php	1614	Method Holiday::getConfCP() should return string but returns int.
htdocs/holiday/class/holiday.class.php	1797	Method Holiday::getCPforUser() should return float but returns null.
htdocs/holiday/class/holiday.class.php	1800	Method Holiday::getCPforUser() should return float but returns null.
2024-02-12 02:07:40 +01:00
thibdrev
1c0d58d9ce qual: phptan for htdocs/product/class/product.class.php (#28121)
* qual: phptan for htdocs/product/class/html.formproduct.class.php	582

htdocs/product/class/html.formproduct.class.php	582	Method FormProduct::selectMeasuringUnits() should return string but returns int.
htdocs/product/class/html.formproduct.class.php	651	Method FormProduct::selectProductNature() should return string but returns int.

* phpcs
2024-02-12 02:07:21 +01:00
thibdrev
c93905cf81 qual: phpstan for htdocs/variants/class/ProductAttribute.class.php (#28122)
htdocs/variants/class/ProductAttribute.class.php	1401	Parameter #7 $seller (string) of method ProductAttribute::printObjectLine() should be compatible with parameter $seller (Societe) of method CommonObject::printObjectLine()
htdocs/variants/class/ProductAttribute.class.php	1401	Parameter #8 $buyer (string) of method ProductAttribute::printObjectLine() should be compatible with parameter $buyer (Societe) of method CommonObject::printObjectLine()
2024-02-12 02:06:42 +01:00
Frédéric FRANCE
0d5da78085 fix migration using utf8mb4 (#28124) 2024-02-12 02:05:52 +01:00
Frédéric FRANCE
d25ff58eb6 fix broken install sql (#28125) 2024-02-12 02:04:06 +01:00
Frédéric FRANCE
3c4789e3b7 fix warning (#28126)
* fix warning

* Update cronjob.class.php
2024-02-12 02:03:49 +01:00
MDW
6e39bcba33 Qual: Fix spelling (#28130)
# Qual: Fix spelling

Fix some spelling issues detect by codespell
2024-02-12 02:02:18 +01:00
MDW
1c452bc86e Qual: Fix apstats & add phan (#28127)
# Qual: Fix apstats & add phan

I fixed several issues that I ran into when running apstats.php
locally to test the phan integration.

So this commit only proposes the updates to apstats.php.

I added a test that disables phan when its configurations is not
found so it should be fine to integration in develop.
2024-02-12 02:01:51 +01:00
Frédéric FRANCE
ed19e0603f remove duplicate llx_ticket-ticket.sql (#28128) 2024-02-12 01:57:03 +01:00
Laurent Destailleur
2880738255 Work on websitetemplates 2024-02-12 01:54:15 +01:00
Laurent Destailleur
6ef86d2f85 Fix restore non mandatory 2024-02-11 21:54:15 +01:00
Laurent Destailleur
dbc6027d9b Fix fieldrequired 2024-02-11 21:51:27 +01:00
Laurent Destailleur
29eb98816e disable bad link 2024-02-11 18:09:20 +01:00
Laurent Destailleur
f26bbb022a Fix delay 2024-02-11 18:07:55 +01:00
Laurent Destailleur
12908df0d6 Work on scan security commits 2024-02-11 16:39:31 +01:00
Laurent Destailleur
aea35bbf47 Last security on last 6 month 2024-02-11 15:42:03 +01:00
Laurent Destailleur
8c0b42bf26 Fix link 2024-02-11 13:44:27 +01:00
Laurent Destailleur
9e1a28a8ce Add description 2024-02-11 13:43:05 +01:00
Laurent Destailleur
33c8d3ce68 Add latest security alerts in apstats 2024-02-11 13:35:49 +01:00
Laurent Destailleur
018a603d80 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-11 12:25:32 +01:00
Laurent Destailleur
77e836c1b9 Fix remove a test that has no sense 2024-02-11 12:25:21 +01:00
Frédéric FRANCE
34d7deb176 fix warning (#28105) 2024-02-11 11:12:49 +01:00
Frédéric FRANCE
f4751e3b2f fix phpstan (#28106)
htdocs/user/class/user.class.php Property User::$rights (stdClass) does not accept null.
2024-02-11 11:11:58 +01:00
Frédéric FRANCE
f9212cd5db fix warning (#28112) 2024-02-11 11:11:30 +01:00
Jon Bendtsen
62177404a5 NEW - adding online_payment_url to invoices API (#28107)
* copied online_payment_url setup from order to invoices

* // comment fix and also 1 typo

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2024-02-11 11:10:55 +01:00
Frédéric FRANCE
de54666611 Update tooltip opensurveysondage (#28109)
* Update tootltip opensurveysondage

* Update opensurveysondage.class.php

* add hook
2024-02-11 11:08:07 +01:00
Frédéric FRANCE
4319e8f6a5 fix warning (#28111) 2024-02-11 11:03:59 +01:00
Laurent Destailleur
9abdc1229a Fix test to execute workflow actions. Add more info in trigger errors. 2024-02-10 21:25:26 +01:00
Laurent Destailleur
c27774463f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-10 19:10:05 +01:00
Laurent Destailleur
3bf105aaa6 Add script with last security alerts 2024-02-10 19:09:47 +01:00
MDW
2e254892ea Qual: Clean up codespell exceptions (#28104)
The files with exceptions can be updated as there are many less cases to
exclude.

In the project files there are a few minor spelling corrections, and
`$scrit` was changed to `$search_crit` to avoid a spelling suggestion.
2024-02-10 17:27:36 +01:00
MDW
16f723f0ba Qual Language scripts fixed/updated (#28101)
* Qual: Fix/extend language scripts, integrate in pre-commit

Updated scripts to comply with shellscript.
Integrated one in pre-commit that seems useful.

* Qual: Find duplicate lang keys

* Add line numbers (to allow annotation)

* Fix fixaltlanguages.sh and add to pre-commit

* Make historical language checks 'manual' in 'pre-commit'
2024-02-10 17:26:34 +01:00