Commit Graph

8531 Commits

Author SHA1 Message Date
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
ab40634dcb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-24 16:28:32 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +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
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
Laurent Destailleur
ac88e5f59e Merge pull request #20980 from atm-maxime/fix_scrutinizer1
Fix scrutinizer and remove unused functions
2022-05-22 17:18:34 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
7b4dae8773 CSS 2022-05-22 16:16:17 +02:00
Lucas Marcouiller
f43f2ab670 push phpunit to of the function 2022-05-22 15:44:57 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Maxime Kohlhaas
0559cc08ac Fix scrutinizer remove unused functions 2022-05-22 01:28:27 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Lucas Marcouiller
dbf66988a6 fix style errors 2022-05-21 23:24:18 +02:00
Lucas Marcouiller
bc77a26976 New : dol_move_dir 2022-05-21 23:24:03 +02:00
Lucas Marcouiller
adfee839d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-21 19:19:02 +02:00
IC-Ilies
9ea12664f7 FIX #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB 2022-05-21 17:14:26 +02:00
Nicolas Domenech
cc90461482 Fix : Missing description field in function dol_dir_list_in_database 2022-05-21 16:30:05 +02:00
Laurent Destailleur
a24fad1a44 Merge pull request #20925 from homer8173/patch-34
Update files.lib.php
2022-05-21 00:39:10 +02:00
Laurent Destailleur
420feba56f Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
Laurent Destailleur
58a77ae890 Merge pull request #20134 from Hystepik/develop#2
Fix : fix bug in modulebuilder and fix php8.0 warnings in modulebuilder
2022-05-20 22:50:35 +02:00
Norbert Penel
9bb0f639f6 Update files.lib.php 2022-05-20 21:31:14 +02:00
Lucas Marcouiller
c887f48dee fix in social import 2022-05-20 21:12:55 +02:00
Lucas Marcouiller
2b84dc39de fix error management 2022-05-20 17:03:36 +02:00
Quentin VIAL-GOUTEYRON
a2fe72225f NEW : hook for dol_format_address 2022-05-20 10:06:28 +02:00
Laurent Destailleur
9e2e3393c6 Work on popup create pages 2022-05-19 21:32:17 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
0d20a3b606 Prepare code for dic management 2022-05-18 21:54:38 +02:00
Laurent Destailleur
1a0e416c1a WIP 2022-05-18 00:51:20 +02:00
Laurent Destailleur
2a34d6354f Fix scrutinizer 2022-05-17 20:08:59 +02:00
Laurent Destailleur
5f0a34166d NEW Add a protection into PHPunit to avoid to forget a var_dump 2022-05-17 15:10:20 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
480b48e5e1 Fix var_dump 2022-05-17 14:36:56 +02:00
Laurent Destailleur
a2e814b079 Fix permissions 2022-05-17 07:30:02 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
Laurent Destailleur
402398912b Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface
NEW create third-party with contact if not found on pulic ticket
2022-05-16 20:44:40 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
937d0418b4 Fix tz 2022-05-16 16:08:54 +02:00
Laurent Destailleur
61153f04c8 Merge branch 'develop' into dev_event_factrec 2022-05-16 15:34:39 +02:00
Laurent Destailleur
783337604d Fix regression in address formating 2022-05-16 15:28:36 +02:00
Laurent Destailleur
84fccb0988 Debug v16 2022-05-16 13:57:11 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Florian HENRY
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
lvessiller
d5356076fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-ticket-public-interface 2022-05-13 09:32:37 +02:00
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
lvessiller
0a5b2097e7 FIX resolve conflicts 2022-05-12 17:07:23 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00