Commit Graph

664 Commits

Author SHA1 Message Date
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
23a7491e12 NEW: Add option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after
specific assigned contact on PDF
2023-05-15 11:30:45 +02:00
Laurent Destailleur
5876e71072 NEW: Add option PDF_SHOW_PHONE_AFTER_USER_CONTACT to show phone after
specific assigned contact on PDF
2023-05-15 11:20:18 +02:00
Laurent Destailleur
b51e6ac025 Fix column length 2023-05-14 20:51:36 +02:00
Laurent Destailleur
80f5358e6e Fix label for title of table must be short value 2023-05-14 20:44:52 +02:00
Laurent Destailleur
8705cf1e7d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-14 20:40:59 +02:00
Laurent Destailleur
70ddfd1bec Fix sentence overwrite on proposal PDF 2023-05-14 20:37:51 +02:00
Laurent Destailleur
33defc20dc Fix sentence overwrite on sale order PDF 2023-05-14 20:09:04 +02:00
Laurent Destailleur
23f7a4fc46 Merge pull request #20548 from iouston/patch-6
Add PROFORMA_PDF_WITH_SUFFIX option
2023-05-02 04:26:27 +02:00
Laurent Destailleur
cfb2d4e8c0 Update pdf_einstein.modules.php 2023-05-02 04:26:09 +02:00
Laurent Destailleur
2d17e77ff7 Fix warning 2023-05-01 17:29:54 +02:00
Laurent Destailleur
aafb54fbc3 Declare properties 2023-04-27 23:01:34 +02:00
Frédéric FRANCE
145880bc92 try to use function 2023-03-08 21:52:50 +01:00
Frédéric FRANCE
a9b9812b7e try to use function 2023-03-08 21:39:05 +01:00
Laurent Destailleur
9fd9b0cfa0 Merge branch 'develop' into fix_multicompany_compatibility2 2023-03-02 13:42:40 +01:00
Regis Houssin
d3c65e390b TODO remise_percent is a deprecated field for object parent 2023-02-28 15:47:33 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
268f0b7c36 Merge pull request #23375 from grandoc/new_branch_30_12_2022
update code toward php8 compliance
2023-01-04 08:33:25 +01:00
Laurent Destailleur
57358b618b Clean code 2022-12-31 17:08:10 +01:00
Laurent Destailleur
8774f4f092 Fix warning qodana 2022-12-31 13:44:11 +01:00
Philippe GRAND
c3d75cb1d4 update code toward php8 compliance 2022-12-30 12:49:31 +01:00
Philippe GRAND
e8fe061071 update code toward php8 compliance 2022-12-30 12:49:02 +01:00
Laurent Destailleur
c886bad8b6 Fix warning 2022-12-28 17:00:28 +01:00
Laurent Destailleur
8dd332a606 Merge pull request #23245 from grandoc/new_branch_17_12_2022
update code toward php 8 compliance
2022-12-22 14:42:00 +01:00
Frédéric FRANCE
42cf7acfe5 doc translation 2022-12-21 17:26:16 +01:00
Frédéric FRANCE
f11418c108 doc translation 2022-12-21 17:23:33 +01:00
Frédéric FRANCE
690562c22e add numbering modules for members 2022-12-21 16:43:38 +01:00
Philippe GRAND
a909ac8371 update code toward php 8 compliance 2022-12-17 15:29:36 +01:00
Philippe GRAND
cac7ba3a20 update code toward php 8 compliance 2022-12-17 15:28:35 +01:00
Philippe GRAND
7d97fb5e0d update code toward php 8 compliance 2022-12-17 12:41:20 +01:00
Philippe GRAND
b83bc96ac8 update code toward php 8 compliance 2022-12-17 12:40:57 +01:00
Philippe GRAND
0ed3717fcc update code toward php 8 compliance 2022-12-17 12:32:09 +01:00
Philippe GRAND
fd73440865 update code toward php 8 compliance 2022-12-17 12:31:37 +01:00
Philippe GRAND
be34a7c3ae Update code for php8 compliance 2022-12-10 15:58:02 +01:00
Laurent Destailleur
2dffe3748d Debug v17 - Fix missing delete picto on ODT setup 2022-11-18 13:41:27 +01:00
Laurent Destailleur
018d5f5446 Merge pull request #22545 from grandoc/new_branch_10_10_2022
New branch 10 10 2022
2022-10-13 10:26:45 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Philippe GRAND
1d7b6a084d update code towards php8 compliance 2022-10-10 11:00:54 +02:00
Philippe GRAND
460ecddaca update code towards php8 compliance 2022-10-10 10:49:19 +02:00
Philippe GRAND
cb1b4b82af update code towards php8 compliance 2022-10-06 16:45:30 +02:00
Philippe GRAND
73e58bb5ba update code towards php8 compliance 2022-10-06 10:01:57 +02:00
Philippe GRAND
2e8ec591c3 update code towards php8 compliance 2022-10-06 10:01:22 +02:00
Laurent Destailleur
dc30cb19b5 Merge pull request #22456 from grandoc/new_branch_29_09_2022
update code toward php8
2022-10-04 18:10:01 +02:00
Laurent Destailleur
395312737b Merge pull request #22406 from aspangaro/17p6
Use isModEnabled
2022-10-04 18:01:59 +02:00
Philippe GRAND
0da6864147 update code towards php8 compliance 2022-10-03 11:28:44 +02:00
Philippe GRAND
465d2a1975 update code toward php8 2022-09-29 12:03:12 +02:00
Philippe GRAND
c45a1115c1 update code toward php8 2022-09-29 12:02:43 +02:00
Laurent Destailleur
98ed321514 Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
c7ee2f413c min php version is 7.0 2022-09-27 20:48:47 +02:00
Alexandre SPANGARO
8c14377ecc Use isModEnabled 2022-09-25 22:52:16 +02:00