Commit Graph

13788 Commits

Author SHA1 Message Date
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
9a1afee6d2 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-12 03:36:46 +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
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
Laurent Destailleur
a104fbe7b3 Log 2024-02-10 16:59:09 +01:00
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
Laurent Destailleur
7ed45a43a5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 15:09:42 +01:00
Laurent Destailleur
8e0559f9a4 Debug v19 2024-02-08 04:23:29 +01:00
Laurent Destailleur
e8e7a3fe95 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-08 01:36:24 +01:00
thibdrev
f98c5b1481 qual: phpstan for htdocs/compta/bank/class/account.class.php (#28060)
* qual: phpstan for htdocs/compta/bank/class/account.class.php

htdocs/compta/bank/class/account.class.php	798	Property AccountLine::$fk_type (int) does not accept string.
htdocs/compta/bank/class/account.class.php	1290	Method Account::solde() should return int but returns string.

* phpcs
2024-02-08 00:17:43 +01:00
thibdrev
21af889405 qual: phpstan for htdocs/compta/facture/class/facture-rec.class.php (#28061)
* qual: phpstan for htdocs/compta/facture/class/facture-rec.class.php

htdocs/compta/facture/class/facture-rec.class.php	1271	Method FactureRec::strikeIfMaxNbGenReached() should return bool but returns string.
htdocs/compta/facture/class/facture-rec.class.php	1299	Property CommonObject::$output (string) does not accept null.

* typo

* phpcs
2024-02-08 00:17:02 +01:00
thibdrev
cb7134871b qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php (#28062)
* qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php

htdocs/compta/paiement/class/cpaiement.class.php	98	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	253	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	373	Property Cpaiement::$active (int) does not accept string.

* Update commondict.class.php
2024-02-08 00:16:22 +01:00
Laurent Destailleur
b8b68ed820 Close #28058 2024-02-08 00:09:17 +01:00
Laurent Destailleur
a7529665da Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
2024-02-08 00:06:52 +01:00
Laurent Destailleur
1322c20f91 Clean code 2024-02-08 00:04:50 +01:00
Laurent Destailleur
02517b7c3f Fix #28055 2024-02-07 20:47:47 +01:00
Laurent Destailleur
2c1e547d88 Fix #28055 2024-02-07 20:44:36 +01:00
Laurent Destailleur
eb4f53665d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
2024-02-07 18:30:10 +01:00
sonikf
c45b7fb844 fix undefined array key (#28048) 2024-02-07 16:25:37 +01:00
Laurent Destailleur
f1f92f8922 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-05 01:43:00 +01:00
Alexandre SPANGARO
b0f999fc5a FIX Accounting files export - Use th instead of td on all title columns (#28003)
* Remove duplicate lines

* FIX Accounting files export - Use th instead of td on all title columns

* Copyright
2024-02-05 01:40:36 +01:00
Laurent Destailleur
428a1758ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-03 00:13:07 +01:00
Laurent Destailleur
c7a13ed975 Fix codespell 2024-02-03 00:12:55 +01:00
thibdrev
3acab565aa qual: phpdoc for htdocs/compta/paiement/class/paiement.class.php (#27962)
* qual: phpdoc for htdocs/compta/paiement/class/paiement.class.php

* phpcs
2024-02-03 00:05:48 +01:00
Laurent Destailleur
e08bf0c567 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-02 23:47:14 +01:00
Laurent Destailleur
1d6cbe1fda Fix GETPOST use should be avoid in classes 2024-02-02 23:46:12 +01:00
Laurent Destailleur
32e205b5d1 Clean code 2024-02-02 19:50:43 +01:00
thibdrev
9e1ec834c2 qual: phpstan for (#27961)
htdocs/compta/bank/card.php	162	Property Account::$fk_accountancy_journal (int) does not accept string.
htdocs/compta/bank/card.php	275	Property Account::$fk_accountancy_journal (int) does not accept string.
2024-02-02 13:43:23 +01:00
Laurent Destailleur
c9823f2b8d Move 401 to 403 2024-02-01 19:34:13 +01:00
Laurent Destailleur
1d69089702 FIX Must use the ICS and not IDS bu default 2024-01-31 03:49:13 +01:00
Laurent Destailleur
3d25e5db4f FIX Must use the ICS and not IDS bu default 2024-01-31 03:48:09 +01:00
thibdrev
83e90c65c2 qual: phpstan for htdocs/compta/tva/class/tva.class.php
htdocs/compta/tva/class/tva.class.php	88	PHPDoc type int|string of property Tva::$totalpaid is not covariant with PHPDoc type float of overridden property CommonObject::$totalpaid.
htdocs/compta/tva/class/tva.class.php	429	Property Tva::$fk_bank (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	430	Property Tva::$fk_user_creat (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	431	Property Tva::$fk_user_modif (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	579	Property Tva::$datec (DateTime) does not accept int.
2024-01-30 21:12:19 +01:00
Laurent Destailleur
fd0495e1c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-29 11:41:22 +01:00
Laurent Destailleur
a4e2d6ea42 Fix doc 2024-01-29 11:06:03 +01:00
Laurent Destailleur
3f3ef6f254 Merge branch 'develop' into new-trigger-showonlynepaymenturl 2024-01-28 12:58:25 +01:00
Laurent Destailleur
62e25855e5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-28 00:40:53 +01:00
Laurent Destailleur
f3ce7a2a93 Debug v19 Fix label of option 2024-01-28 00:37:48 +01:00
Hystepik
69289f5005 New hook to allow module show onlinepaymenturl 2024-01-26 15:41:13 +01:00
Laurent Destailleur
c49e0bf46b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-26 03:58:41 +01:00
Laurent Destailleur
c2398cbffa Merge pull request #27782 from thibdrev/patch-1
qual: phpstan for /htdocs/compta/bank/card.php
2024-01-26 02:30:40 +01:00
Laurent Destailleur
0b3fe86670 Merge pull request #27783 from thibdrev/patch-2
qual: phpstan for htdocs/compta/bank/class/paymentvarious.class.php
2024-01-26 02:29:19 +01:00
Laurent Destailleur
45b2668340 Update paymentvarious.class.php 2024-01-26 02:29:03 +01:00
Laurent Destailleur
3a22fb28e3 Merge pull request #27784 from thibdrev/patch-3
qual: phpstan for htdocs/compta/facture/class/facture.class.php
2024-01-26 02:27:43 +01:00
Laurent Destailleur
06a90b5d1b Update facture.class.php 2024-01-26 02:27:09 +01:00
Laurent Destailleur
c8e11e1145 Update facture.class.php 2024-01-26 02:26:26 +01:00
Laurent Destailleur
04ad7a39d0 Merge pull request #27787 from thibdrev/patch-5
qual: phpstan for htdocs/compta/paiement_charge.php
2024-01-26 02:23:40 +01:00
Laurent Destailleur
537b0c956a Merge pull request #27786 from thibdrev/patch-4
qual: phpstan for htdocs/compta/paiement/cheque/card.php
2024-01-26 02:23:07 +01:00
Laurent Destailleur
9190242ee0 Merge pull request #27788 from thibdrev/patch-6
qual: phpstan for htdocs/compta/paiement_vat.php
2024-01-26 02:22:43 +01:00