Commit Graph

8406 Commits

Author SHA1 Message Date
Laurent Destailleur
00649e791c Fix #yogosha11452 2022-06-25 02:18:16 +02:00
Laurent Destailleur
b1ab8ba9b3 Merge branch 'develop' into patch-211 2022-06-23 11:41:09 +02:00
Laurent Destailleur
264f8ab4ce Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Laurent Destailleur
e698d20789 Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
BENKE Charlene
b37d874936 Update expedition.php 2022-06-20 16:01:25 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Hystepik
45439e055c Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
cef7f6b96b Merge pull request #21279 from hregis/fix_missing_entity
FIX missing field entity
2022-06-14 21:14:56 +02:00
Regis Houssin
abcf77c80a FIX missing field entity 2022-06-14 18:16:41 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
BENKE Charlene
b6bd8b3619 php V8 warning 2022-06-13 08:20:29 +02:00
Laurent Destailleur
00446a10d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-12 12:42:01 +02:00
Laurent Destailleur
426c1635c4 Clean code 2022-06-12 12:41:15 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1f26dee554 Fix deprecated functions 2022-06-08 17:19:12 +02:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3 Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias
NEW - Add option pdf global thirdparty alias
2022-06-07 10:43:18 +02:00
Laurent Destailleur
418bd481f3 FIX #21128 2022-06-07 09:51:19 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1 Clean database 2022-06-03 02:56:25 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
2022-06-01 21:55:36 +02:00
Laurent Destailleur
62ee0ff29c Merge pull request #21054 from frederic34/patch-1
force refresh css
2022-06-01 21:34:23 +02:00
Laurent Destailleur
e3fa24fab2 Merge pull request #18283 from atm-gauthier/NEW_stockstransfers
NEW : Stocks transfers objects management
2022-06-01 14:49:21 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
2d0958ba7f Look and feel v16 2022-05-31 11:00:21 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Frédéric FRANCE
489aa22e56 force refresh css 2022-05-30 14:14:18 +02:00
Laurent Destailleur
dc3121dc42 Merge pull request #21043 from defrance/patch-194
php V8 warning ($conf->global-b*)
2022-05-29 10:52:50 +02:00
BENKE Charlene
eba9f695c2 fix php 8 warning 2022-05-28 10:02:02 +02:00
BENKE Charlene
b1c4aa07f0 fix php 8 warning 2022-05-28 09:58:54 +02:00
BENKE Charlene
ebfc566698 php V8 warning 2022-05-27 16:16:41 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00
Laurent Destailleur
43be070300 PHP8.1 strftime("%Y%m%d%H%M") => dol_print_date(dol_now('gmt'),
"dayhourlogsmall", 'tzuser')
2022-05-24 11:55:21 +02:00