Commit Graph

7948 Commits

Author SHA1 Message Date
Laurent Destailleur
1caf853528 Work on website templates from modules 2024-02-12 02:52:35 +01:00
Laurent Destailleur
e0d8bf04b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 19:07:24 +01:00
Laurent Destailleur
c261b84667 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 19:06:52 +01:00
Laurent Destailleur
d07b7dc72e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-09 19:05:41 +01:00
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
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
noec764
fac22fd16f NEW: Hook after total Table on PDF (#28092)
Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 16:53:36 +01:00
Philippe Grand
c782686610 fix : Fatal error: Uncaught Error: Object of class Conf could not be converted to string in /srv/users/dolibarr/apps/dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php:98 Stack trace: #0 /srv/users/dolibarr/apps/dolibarr/htdocs/societe/admin/societe.php(495): mod_codecompta_aquarium->info(Object(Translate)) #1 {main} thrown in /srv/users/dolibarr/apps/dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php on line 98 (#28093) 2024-02-09 16:52:17 +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
noec764
2c07bd764d FIX: Bar code verification should be done by entity because generation does (#28087)
* FIX: Bar code verification should be done by entity because generation does

* FIX: handle Entities shared tables

* FIX: Remove unused global

---------

Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 14:07:04 +01:00
Laurent Destailleur
4707304775 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 13:34:30 +01:00
Laurent Destailleur
0f53fe10d1 FIX oauth authent must be done only on click on link
Better message for notification denied.
2024-02-09 13:32:44 +01:00
Frédéric FRANCE
6cc1c23227 fix picto for modAi (#28076) 2024-02-09 11:30:13 +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
Frédéric FRANCE
77ece35494 fix warning (#28081) 2024-02-09 11:27:13 +01:00
Laurent Destailleur
6546892743 Debug import of agenda events 2024-02-08 15:41:05 +01:00
atm-sami
564c341af3 New import actioncomm and add fields to export (#27184)
* add import for events and more fields to export also

* update

* update to allowed mutli entity# Veuillez saisir le message de validation pour vos modifications. Les lignes

* update

* Update import_csv.modules.php

* update

* Update modAgenda.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 15:31:27 +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
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
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
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
97006d6945 Clean code: Remove code not working (was using hard coded values) 2024-02-02 21:41:40 +01:00
Laurent Destailleur
a00acaec35 Fix sql syntax error 2024-02-01 14:43:39 +01:00
Laurent Destailleur
5a5c7d5228 Clean code 2024-02-01 14:28:22 +01:00
Laurent Destailleur
663ddfbe4a NEW Add code+label of payment mode and term in purchase invoice export 2024-02-01 14:28:11 +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
badf3e1971 Fix payment mode/term and label and sort order in export 2024-02-01 11:53:55 +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
16accb3460 Fix missing due date 2024-01-31 11:19:52 +01:00
Laurent Destailleur
70ab796c23 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-29 10:30:01 +01:00
William Mead
a615672525 Added client code to order export 2024-01-29 09:23:11 +01:00
Laurent Destailleur
df9349a866 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-29 01:27:25 +01:00
Laurent Destailleur
ecbfeaddc5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-29 01:26:55 +01:00
Laurent Destailleur
beaee43eef Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-29 01:26:18 +01:00
Laurent Destailleur
d34f9ffece Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-29 01:25:37 +01:00
Laurent Destailleur
92cf4f2fd1 Mutualize code 2024-01-28 16:36:01 +01:00
Laurent Destailleur
3f3ef6f254 Merge branch 'develop' into new-trigger-showonlynepaymenturl 2024-01-28 12:58:25 +01:00
Laurent Destailleur
25a91c63cf Debug webportal module 2024-01-27 17:23:03 +01:00
Laurent Destailleur
77e101e2ca Debug AI module 2024-01-27 02:04:43 +01:00
Hystepik
47c98623f4 fix php errors 2024-01-26 15:58:22 +01:00
Hystepik
69289f5005 New hook to allow module show onlinepaymenturl 2024-01-26 15:41:13 +01:00
Quentin VIAL-GOUTEYRON
bb2f13aed4 FIX : crabe PDF is generating in conf->entity instead of object->entity 2024-01-25 14:40:11 +01:00
vmaury
7ff8354933 Allow external site menu displayed to external users 2024-01-25 11:05:35 +01:00
vmaury
db2f7ba823 Allow external site menu displayed to external users 2024-01-25 11:00:26 +01:00
Frédéric FRANCE
9cfe1d8e88 Merge branch 'develop' into patch-14 2024-01-24 08:44:20 +01:00
Laurent Destailleur
0602b40e3a FIX Debug setup of module TakePOS 2024-01-24 03:34:42 +01:00