2
0
forked from Wavyzz/dolibarr
Commit Graph

10504 Commits

Author SHA1 Message Date
Laurent Destailleur
2880738255 Work on websitetemplates 2024-02-12 01:54:15 +01:00
lvessiller-opendsi
5092d17d2a NEW determine multi-currency price on object line create tpl (#28021) 2024-02-10 01:09:24 +01:00
lamrani abdelwadoud
e68e0283ca update function show_actions_done for list users events (#28095) 2024-02-09 19:01:45 +01:00
Laurent Destailleur
d4296c2ffd Work on website templates from external modules 2024-02-09 17:54:57 +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
thibdrev
0f62b8e7bc qual: phpstan (#28075)
* qual: phpstan for htdocs/core/lib/images.lib.php

htdocs/core/lib/images.lib.php	636	Function vignette() should return string but returns int.

* qual: phpstan for htdocs/core/lib/product.lib.php

htdocs/core/lib/product.lib.php	839	Function measuringUnitString() should return string but returns int.

* qual: phpstan for htdocs/core/lib/website.lib.php

htdocs/core/lib/website.lib.php	222	Function dolWebsiteReplacementOfLinks() should return bool but returns string.

* qual: phpstan for htdocs/core/lib/functions.lib.php

htdocs/core/lib/functions.lib.php	9576	Function dol_getIdFromCode() should return int but returns string.

* qual: phpstan for htdocs/core/modules/import/modules_import.php

htdocs/core/modules/import/modules_import.php	173	Method ModeleImports::getDriverId() should return int but returns string.

* qual: phpstan for htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

htdocs/core/modules/mailings/thirdparties_services_expired.modules.php	100	Method mailing_thirdparties_services_expired::add_to_target() should return int but returns string.

* qual:phpstan for htdocs/loan/schedule.php

htdocs/loan/schedule.php	80	Property LoanSchedule::$datec (string) does not accept int.
2024-02-09 11:28:33 +01:00
Laurent Destailleur
9d7d74babc FIX Use of MAIN_BUILD_LOGIN_RULE and
MAIN_USER_SEPARATOR_CHAR_FOR_GENERATED_LOGIN
2024-02-08 16:28:24 +01:00
Laurent Destailleur
7783575bf7 Fix bad parameter 2024-02-08 15:02:54 +01:00
Laurent Destailleur
49c1c42d83 Doxygen 2024-02-08 14:58:30 +01:00
Laurent Destailleur
18d05ef570 Fix phpstan 2024-02-08 14:26:49 +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
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
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
792606925f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2024-02-07 17:50:38 +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
Laurent Destailleur
f828cc5119 Debug v19 2024-02-07 12:28:35 +01:00
Laurent Destailleur
4aeda8d28d Fix escapeforlike/escape 2024-02-03 15:29:40 +01:00
Laurent Destailleur
fedbc0f08e Fix use of not existing object 2024-02-02 12:51:11 +01:00
Mohamed DAOUD
a99e44b6c3 NEW Asset Module - make asset model creation in a single step (#26982)
* make asset model creation in a single step

* fix test unit issue

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-01 16:26:25 +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
75df3bc24d FIX #27375 2024-02-01 12:43:46 +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
5d795cee23 Enhance error management of unzip 2024-01-31 23:03:48 +01:00
Laurent Destailleur
ca86dd4699 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-31 18:27:19 +01:00
Laurent Destailleur
9843f31814 Fix warning 2024-01-31 18:26:09 +01:00
Laurent Destailleur
a0d0e60600 Use the good wrapper for image when in web server mode 2024-01-31 13:01:05 +01:00
MDW
23b73eb714 Fix: dol_eval - return value in case of exception.
# Fix: dol_eval - return value in case of exception.

dol_eval did not return a value in case of exception.  Fixed.
2024-01-31 09:28:08 +01:00
Laurent Destailleur
70444b75f4 Fix title 2024-01-31 03:13:54 +01:00
Laurent Destailleur
4c0fa340f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-31 02:48:14 +01:00
Laurent Destailleur
a48a399b31 FIX Add a limit in nb of element in view event/message 2024-01-31 02:47:49 +01:00
Laurent Destailleur
280a7a24e4 Rename page 2024-01-31 01:56:24 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Laurent Destailleur
8d68091d3a Merge pull request #27895 from thibdrev/patch-1
qual: roundUpToNextMultiple()
2024-01-30 21:04:28 +01:00
thibdrev
5ebc760e04 qual Update functions.lib.php - clearer return for roundUpToNextMultiple() 2024-01-30 17:36:55 +01:00
Laurent Destailleur
27a6a61827 Merge branch 'develop' into setTemplateForEachModel 2024-01-30 17:07:36 +01:00
Laurent Destailleur
6420a5e945 Merge pull request #27865 from thibdrev/patch-3
qual: phpstan for htdocs/core/lib/functions.lib.php
2024-01-30 16:45:52 +01:00
Laurent Destailleur
6d6f1acec0 Merge branch 'develop' into typing/files.lib 2024-01-30 16:06:08 +01:00
Lamrani Abdel
9ef70a70be fix orthographe 2024-01-30 15:51:38 +01:00
Lamrani Abdel
11d985e24f generate html model for each box 2024-01-30 15:37:52 +01:00
Laurent Destailleur
63c5b65592 Allow the page for website account by default 2024-01-30 13:22:53 +01:00
MDW
f0cb078378 Qual: Fix typing in files.lib
Fix several typing hints in files.lib .
Fixed some initialisers.
Simplified some expressions.
Cast some `return $result` statements  (could be null).
2024-01-29 18:34:28 +01:00
thibdrev
2fe5347d66 qual: phpstan for htdocs/core/lib/functions.lib.php
htdocs/core/lib/functions.lib.php	128	Function getMultidirOutput() should return string|void but returns null.
htdocs/core/lib/functions.lib.php	9889	Function getLanguageCodeFromCountryCode() should return string but returns null.
htdocs/core/lib/functions.lib.php	10105	Function getLanguageCodeFromCountryCode() should return string but returns null.
htdocs/core/lib/functions.lib.php	11372	Function roundUpToNextMultiple() should return int but returns float.
2024-01-29 18:22:54 +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
0815df6bdf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-29 11:40:57 +01:00
Laurent Destailleur
eab0093750 Fix var not defined 2024-01-29 11:24:37 +01:00
Laurent Destailleur
34ee316330 Merge pull request #27844 from frederic34/patch-7
add idprofxx missing in societe class
2024-01-29 00:37:05 +01:00
Laurent Destailleur
c151a22448 Merge pull request #27838 from thibdrev/patch-7
qual: Update profid.lib.php - Update isValidTinForES() documentation
2024-01-29 00:36:17 +01:00
Frédéric FRANCE
7f4ca53805 Update functions.lib.php 2024-01-28 23:39:52 +01:00
Frédéric FRANCE
3a6cdf6411 Update functions.lib.php 2024-01-28 23:19:56 +01:00