Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,044 Commits 36 Branches 189 Tags
223765aecff59bbff608f7aa7fb65a88e6484a6e
Commit Graph

9151 Commits

Author SHA1 Message Date
Laurent Destailleur
d3fed26d78 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-06-01 22:13:42 +02:00
Laurent Destailleur
ff450e57fd Merge branch 'develop' into patch-198 2022-06-01 22:05:03 +02:00
Laurent Destailleur
d2a8dd6925 Merge pull request #21065 from bb2a/FIX-PHP8-files-lib 
php V8 warning files lib
 2022-06-01 20:58:44 +02:00
BB2A Anthony Berton
976f6d42b8 php V8 warning 2022-06-01 09:15:21 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
5ada47195a FIX Link to social network 2022-05-31 15:48:50 +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
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
BB2A Anthony Berton
e303f27a19 FIX PHP8 2022-05-31 11:36:23 +02:00
BENKE Charlene
d74fc672e7 Update files.lib.php 2022-05-30 10:23:00 +02:00
BENKE Charlene
785d0e03b7 php V8 warning 2022-05-30 08:43:41 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
343056dcbd Debug v16 2022-05-25 23:43:16 +02:00
Laurent Destailleur
4cca69706a Merge pull request #20968 from Hystepik/develop#2 
New : function dol_move_dir in htdocs/core/lib/files.lib.php
 2022-05-25 19:06:57 +02:00
Laurent Destailleur
1dd2ce0399 Merge pull request #21024 from atm-john/15.0_fix_btn_confirm_url 
Fix btn confirm url
 2022-05-25 16:56:54 +02:00
John BOTELLA
e07827a0be Fix btn confirm url 2022-05-25 10:03:08 +02:00
John BOTELLA
9d31d6448c Fix btn confirm url 2022-05-25 09:59:45 +02:00
Laurent Destailleur
4c10c04f9f Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00
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