Commit Graph

8402 Commits

Author SHA1 Message Date
Frédéric France
f96293f503 use user hasRight 2023-06-12 20:17:21 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00
hystepik
597b36e57c Fix : php8.1 warnings with strict mode 2023-06-10 10:47:36 +02:00
Laurent Destailleur
0fd1f319dd Debug v18 2023-06-09 18:18:13 +02:00
Laurent Destailleur
a373d9da0f Merge pull request #25023 from frederic34/20230609
use user hasRight, isModEnabled
2023-06-09 15:31:13 +02:00
Frédéric FRANCE
bb2c112f76 use isModEnabled 2023-06-09 13:45:19 +02:00
Florian HENRY
a2c0eac09b on going 2023-06-09 11:53:39 +02:00
Laurent Destailleur
a7b26fd7ae Merge pull request #25002 from Hystepik/develop#3
fix php 8.1 warnings with strict  mode
2023-06-09 01:12:02 +02:00
hystepik
180b3a6315 fix php 8.1 warnings with strict mode 2023-06-08 21:34:19 +02:00
Laurent Destailleur
9fa0439d3e Merge pull request #24961 from frederic34/2023_06_05
use user hasRight
2023-06-07 18:53:51 +02:00
Laurent Destailleur
7b61be46db Merge pull request #24983 from AmazingBeu/develop
[Agenda] Fix summary encoding of holidays events for the exports
2023-06-07 18:45:56 +02:00
Beu
2d6013a488 fix summary encoding of holidays events 2023-06-07 18:10:28 +02:00
FLIO
bde80075bf fixing the total ttc in the multicurrency section 2023-06-06 00:21:19 +02:00
Frédéric France
5a018d715d use user hasRight 2023-06-06 00:05:02 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
Laurent Destailleur
80f6af9f4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:37 +02:00
Laurent Destailleur
eb8d54e464 css 2023-06-04 19:06:32 +02:00
Laurent Destailleur
8756be5ebf Merge pull request #24926 from frederic34/patch-2
fix picto tooltip
2023-06-04 15:20:06 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +02:00
Laurent Destailleur
8d7e53a98c Clean code 2023-06-03 13:56:06 +02:00
Frédéric FRANCE
2752154f9b Update propal.class.php 2023-05-31 13:56:41 +02:00
Laurent Destailleur
7f5a4a2229 Debug v18 2023-05-22 21:23:21 +02:00
hystepik
1aae4f1cce Fix : thirdparty global discount page 2023-05-22 16:02:19 +02:00
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
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
584131140d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:47 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
stickler-ci
2c97b66c24 Fixing style errors. 2023-05-16 14:57:46 +00:00
avolani
79cacf58c2 Update propal.class.php
Fix IDs on created proposal lines when cloning so the hook createFrom has all the clone infos
2023-05-16 16:53:58 +02:00
Laurent Destailleur
b72cba5c14 Merge pull request #24775 from Hystepik/develop#3
fix : php 8.1 warnings
2023-05-15 23:21:24 +02:00
Laurent Destailleur
9972ab2f44 CSS 2023-05-15 20:53:31 +02:00
hystepik
979359526e fix : php 8.1 warnings 2023-05-15 16:05:04 +02:00
Laurent Destailleur
3992e12143 Fix responsiv 2023-05-13 17:43:27 +02:00
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
a3a9d1ac9f Fix SQL error 2023-05-10 18:56:17 +02:00
Laurent Destailleur
2d784f3008 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-10 05:01:15 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Laurent Destailleur
91f5971b01 Fix alignment 2023-05-01 18:46:22 +02:00
Laurent Destailleur
72f96cc16c Merge pull request #24437 from FliyFly/editpropalattributes
Edit attributes on propal card
2023-05-01 18:15:06 +02:00
Laurent Destailleur
cfff62c2fa Clean code 2023-04-29 15:46:44 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed Merge pull request #24635 from VMR-Global-Solutions/develop
API add / fix filter on extrafields in index()
2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00