Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-02 14:23:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

39551 Commits

Author SHA1 Message Date
Laurent Destailleur
18d05ef570 Fix phpstan 2024-02-08 14:26:49 +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
Laurent Destailleur
94cd823a7c Fix #yogosha20662 2024-02-08 06:35:04 +01:00
Libre Master
eb110f66c2 Simpler version of getRootURLFromURL (#27927) 
* Simpler version

* Simpler version

* Simpler version

* Try more complete enhancement

* Update geturl.lib.php

* Simpler version

---------

Co-authored-by: Christophe TREMBLAY-GUILLOUX <christophe@libremaster.ovh>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-08 02:08:18 +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
Laurent Destailleur
550e4e8c9a Fix compatibility 
Conflicts:
	htdocs/resource/class/dolresource.class.php
 2024-02-08 00:26:55 +01:00
Laurent Destailleur
038fcbab3d Fix compatibility 2024-02-08 00:24:27 +01:00
thibdrev
0b6467758b qual: phpstan - last errors stating "getNextValue() should return string but returns int." (#28033) 
* Update mod_commande_marbre.php

htdocs/core/modules/commande/mod_commande_marbre.php	152	Method mod_commande_marbre::getNextValue() should return string but returns int.

* Update mod_holiday_madonna.php

htdocs/core/modules/holiday/mod_holiday_madonna.php	150	Method mod_holiday_madonna::getNextValue() should return string but returns int.

* Update mod_project_simple.php

htdocs/core/modules/project/mod_project_simple.php	149	Method mod_project_simple::getNextValue() should return string but returns int.

* Update mod_commande_marbre.php

* Update mod_holiday_madonna.php
 2024-02-08 00:22:49 +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
3c45870bdf Clean code 2024-02-07 19:16:57 +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
William Mead
27002a95e4 Fixed undefined thirdparty_id property (#28044) 2024-02-07 16:29:57 +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
Laurent Destailleur
b40ebfa9e8 Better log for debug 2024-02-06 11:57:27 +01:00
Ariel Bentolila
93427ee7a8 QUAL fix lines' title height calculation 2024-02-05 18:50:26 +02:00
Laurent Destailleur
3557152515 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-05 01:45:47 +01:00
Frédéric FRANCE
080d8e0fa4 fix phpstan (#27989) 
* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-05 01:33:19 +01:00
Laurent Destailleur
bcd401d487 Fix phpcs 2024-02-05 01:13:38 +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
73d9795152 Use rector to convert user->rights into user->hasRight 2024-02-04 18:30:53 +01:00
Laurent Destailleur
758ccb0c5b Use rector to convert user->rights into user->hasRight 2024-02-04 17:27:57 +01:00
Laurent Destailleur
885909a6a3 Enhance rector to fix empty($user->rights->modulex->perm1) 2024-02-04 15:51:05 +01:00
Laurent Destailleur
fd53b05ac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-04 11:39:43 +01:00
Laurent Destailleur
c82869b686 Debug the "validate" feature 2024-02-03 21:11:35 +01:00
thibdrev
dd56ea3cb7 qual: phpstan for htdocs/core/class/openid.class.php (#27984) 
htdocs/core/class/openid.class.php	379	Method SimpleOpenID::GetOpenIDServer() should return string but returns false.
htdocs/core/class/openid.class.php	525	Method SimpleOpenID::sendDiscoveryRequestToGetXRDS() should return string but returns false.
 2024-02-03 18:15:55 +01:00
thibdrev
e8d026da72 qual: phpdoc Update various mod_xxx.php (#27983) 
* Update mod_stocktransfer_advanced.php

* Update mod_stocktransfer_standard.php

* Update mod_facture_fournisseur_cactus.php

* Update mod_facture_fournisseur_tulip.php

* Update mod_commande_fournisseur_orchidee.php

* Update mod_supplier_payment_brodator.php

* Update mod_supplier_payment_bronan.php

* Update mod_supplier_proposal_marbre.php

* Update mod_supplier_proposal_saphir.php

* Update mod_takepos_ref_universal.php

* Update mod_ticket_universal.php

* Update mod_workstation_advanced.php

* Update mod_workstation_standard.php

* Update mod_knowledgerecord_advanced.php

* Update mod_knowledgerecord_standard.php

* Update mod_myobject_advanced.php

* Update mod_myobject_standard.php

* Update mod_partnership_advanced.php

* Update mod_recruitmentcandidature_advanced.php

* Update mod_recruitmentcandidature_standard.php

* Update mod_recruitmentjobposition_advanced.php

* Update mod_recruitmentjobposition_standard.php

* Update mod_partnership_standard.php

* Update mod_stocktransfer_standard.php

* Update mod_supplier_payment_brodator.php

* Update mod_myobject_standard.php
 2024-02-03 18:15:37 +01:00
Laurent Destailleur
021fb83ec6 WIP SMSing 2024-02-03 17:57:12 +01:00
Laurent Destailleur
4aeda8d28d Fix escapeforlike/escape 2024-02-03 15:29:40 +01:00
William Mead
bcabb27c92 NEW supplier order submit method message (#27855) 
* Added supplier order submit method to message. Added contributor details.

* Updated localization with supplier order submit method

* Adjusted order method presentation

* Update interface_50_modAgenda_ActionsAuto.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-03 14:50:56 +01:00
thomas-Ngr
f40b891cfe NEW Develop new quick edit opportunity status (#27892) 
* Add ability to quickly edit project status & percentage

* TEMP

* PHPstan checks
 2024-02-03 14:39:59 +01:00
thibdrev
1804ba1433 qual: phpstan for htdocs/core/class/cunits.class.php (#27982) 
* qual: phpstan for htdocs/core/class/cunits.class.php

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.

* qual: phpstan - Update functions.lib.php - dol_getIdFromCode()

* Update functions.lib.php
 2024-02-03 14:38:36 +01:00
Laurent Destailleur
fc60d20d10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-03 12:59:20 +01:00
Laurent Destailleur
cc1eefa0fe WIP SMSing 2024-02-03 12:58:57 +01:00