Commit Graph

13245 Commits

Author SHA1 Message Date
Laurent Destailleur
2f1eecd709 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-09 19:04:06 +01:00
thibdrev
dbcfa15f72 qual: phpstan for htdocs/commande/class/commande.class.php (#28099)
* Update commande.class.php

* Update commonobject.class.php
2024-02-09 18:57:04 +01:00
thibdrev
07edb9b967 qual: phpstan for htdocs/adherents/class/api_memberstypes.class.php (#28098)
* Update subscription.class.php

* Update commonobject.class.php

* Update subscription.class.php

* Update commonobject.class.php

* Update subscription.class.php

* Update subscription.class.php

* Update commonobject.class.php

* Update commonobject.class.php

* Update subscription.class.php
2024-02-09 18:56:50 +01:00
lvessiller-opendsi
62632893ad FIX avoid from re-initializing result on nested hook getEntity (#27799)
* FIX avoid from re-initializing result on nested hook getEntity

* FIX uses local resPrint instead of cloning hookmanager for nested hooks
2024-02-09 18:15:35 +01:00
Laurent Destailleur
3db4a9f2fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 17:55:19 +01:00
Laurent Destailleur
d4296c2ffd Work on website templates from external modules 2024-02-09 17:54:57 +01:00
Lucas Marcouiller
0a7ae2a139 Fix MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE send protection (#28091)
* Fix autocopy send protection

* fix verification to replace mail in maillist

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-09 16:54:28 +01:00
Laurent Destailleur
ca0a3432b6 Fix phpcs 2024-02-09 16:00:35 +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
thomas-Ngr
ac6b230a86 Fix : modules templates were not fetched for linkedobjectblock (#28084) 2024-02-09 14:10:37 +01:00
Frédéric FRANCE
df1a417ec5 fix phpdoc (#28086) 2024-02-09 11:26:20 +01:00
Lucas Marcouiller
14090f3515 New make replyto as origin_email email collector ticket part (#28040)
* New make replyto as origin_email email collector ticket part

* fix by adding a field

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 13:58:40 +01:00
Frédéric FRANCE
b92b8c443d fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
Florian Mortgat
51efb8d1f6 NEW: FormSetupItem: show picto in front of confs applied across all entitie (#28024)
* NEW: FormSetupItem: show picto in front of confs applied across all entities

* Show globe picto only if multicompany is enabled + use img_picto instead of hard-coded HTML

* Update htdocs/core/class/html.formsetup.class.php

Missing assignment to $out
2024-02-08 01:51:25 +01:00
Laurent Destailleur
763d70cf52 Clean comment to avoid false alert with travis 2024-02-08 01:50:03 +01:00
ariel-bentu
b4543c0894 QUAL Fix PDF generation to not ignore col align. (#28022)
* QUAL Fix PDF generation to not ignore col align.

before fix, if you change a column's content's alignment in a hook - it is ignored.

* fix function documentation

* Update commondocgenerator.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 01:30:18 +01:00
Lucas Marcouiller
44aff249a8 New : displays sender email in ticket message from (#28023)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 01:28:06 +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
thibdrev
ad141c1e1f qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:44 +01:00
thibdrev
1588fc3072 qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:16 +01:00
thibdrev
c81ac78594 qual: phpstan for htdocs/core/class/commonobject.class.php (#28063)
htdocs/core/class/commonobject.class.php	9613	Method CommonObject::quote() should return string but returns int.
2024-02-08 00:14:48 +01:00
Laurent Destailleur
4d49dfc161 Qual: Removed dead code 2024-02-07 22:18:45 +01:00
Frédéric FRANCE
0972ba137d Ticket generate doc (#28031)
* add doc generation to tickets

* add doc generation to tickets

* add doc generation

* add doc generation

* add extraparams fetch

add extraparams fetch

fix call

fix call

fix call

* fix doc

* remove bad setting

* fix default settings on init

* fix template name

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-07 19:36:23 +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
Laurent Destailleur
097290fc38 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/core/class/commonobject.class.php
2024-02-07 18:16:57 +01:00
Laurent Destailleur
4b60b3d991 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2024-02-07 18:11:36 +01:00
Laurent Destailleur
e6b165003f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2024-02-07 18:01:11 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Quentin-Seekness
0ad3581e00 Update cunits.class.php (#28056)
FIX: error SQL when creating a Cunit
2024-02-07 17:29:45 +01:00
boudet jean pascal
fe63333c28 FIX : move input type hidden (#28054)
* move input type hidden

* pre-commit from another dev

* Delete htdocs/includes/mike42/escpos-php/doc/escpos.conf

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-07 16:24:11 +01:00
Laurent Destailleur
f828cc5119 Debug v19 2024-02-07 12:28:35 +01:00
Laurent Destailleur
c66b434c80 Fix for export 2024-02-06 18:41:45 +01:00
Laurent Destailleur
8b8aa3a27f Fix comment 2024-02-06 17:46:12 +01:00
Frédéric FRANCE
10eaa1d269 fix saved model_pdf after generating odt (#28005) 2024-02-05 01:10:35 +01:00
Laurent Destailleur
32e205b5d1 Clean code 2024-02-02 19:50:43 +01:00
Laurent Destailleur
0f931ef471 Disable ajax tooltip by default. Still trouble of persistent popup. 2024-02-02 13:29:02 +01:00
Lucas Marcouiller
d92a5b79b1 New add new const to pervent sending mail to with autocopy (#26894)
* New add new const to pervent sending mail to with autocopy

* to test

* fix pr to always have the check on $to, $addr_cc and addr_bcc

* remove unwanted code

* fix errors

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: hystepik <lmarcouiller@nltechno.com>
2024-02-01 15:32:11 +01:00
Laurent Destailleur
12bac4b4dd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-01 14:08:05 +01:00
Laurent Destailleur
b0fd166142 Add MAIN_MAIL_FORCE_FROM to fix sending email with mono user SMTP 2024-02-01 13:12:21 +01:00
Laurent Destailleur
61921f0364 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-01 12:24:00 +01:00
Laurent Destailleur
4cba87129c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-01 12:22:54 +01:00
Laurent Destailleur
9dd1646818 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-01 12:20:12 +01:00
Laurent Destailleur
7b178844e8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:16:50 +01:00
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Laurent Destailleur
de8265a1bb Merge pull request #27940 from W1W1-M/qual-ldap-class-phpcs
Qual ldap class phpcs
2024-02-01 12:03:47 +01:00
William Mead
f6c91c368c Added deprecated warnings 2024-02-01 11:42:15 +01:00
Laurent Destailleur
64bd38ec78 Merge pull request #27932 from thibdrev/patch-2
qual: phpstan for htdocs/core/class/commoninvoice.class.php
2024-01-31 21:32:01 +01:00
thibdrev
1292bd7612 qual: phpstan for htdocs/core/class/commoninvoice.class.php
htdocs/core/class/commoninvoice.class.php	952	Method CommonInvoice::calculate_date_lim_reglement() should return int but returns string.
htdocs/core/class/commoninvoice.class.php	1547	Property CommonInvoice::$postactionmessages (string) does not accept array.
2024-01-31 21:12:21 +01:00
thibdrev
4ad9e9b828 qual: phpstan for htdocs/core/class/commonobject.class.php
htdocs/core/class/commonobject.class.php	1032	Method CommonObject::getLastMainDocLink() should return string but returns int.
htdocs/core/class/commonobject.class.php	1550	Method CommonObject::liste_type_contact() should return array but returns null.
htdocs/core/class/commonobject.class.php	1638	Method CommonObject::listeTypeContacts() should return array but returns null.
htdocs/core/class/commonobject.class.php	1708	Method CommonObject::getIdContact() should return array but returns null.
htdocs/core/class/commonobject.class.php	2011	Method CommonObject::fetchObjectFrom() should return int but returns false.
htdocs/core/class/commonobject.class.php	2891	Property CommonObject::$retained_warranty_fk_cond_reglement (string) does not accept int.
htdocs/core/class/commonobject.class.php	4868	Method CommonObject::getTotalDiscount() should return float|string but returns null.
htdocs/core/class/commonobject.class.php	9557	Property CommonObject::$ref (string) does not accept int.
htdocs/core/class/commonobject.class.php	10407	Method CommonObject::fetchComments() should return bool but returns int.
htdocs/core/class/commonobject.class.php	10411	Method CommonObject::fetchComments() should return bool but returns int<0, max>.
2024-01-31 21:04:08 +01:00