Commit Graph

557 Commits

Author SHA1 Message Date
Laurent Destailleur
8e82bb7148 Clean code 2022-12-30 02:02:34 +01:00
Laurent Destailleur
e41ca9af5d Debug v17 2022-12-28 01:54:54 +01:00
Laurent Destailleur
08b81203f0 Debug v17 2022-12-26 13:55:29 +01:00
Milen Karaganski
0ef3801eba FIX|Fix [#23202]
Fix for V17

Parent company field missing when editing third party
2022-12-13 11:57:34 +02:00
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
thibdrev
babb114dc0
Update card.php 2022-10-06 09:55:03 +02:00
Alexandre SPANGARO
51aa7e8027 Merge remote-tracking branch 'upstream/develop' into 17p6 2022-10-01 07:52:48 +02:00
Laurent Destailleur
fb28d14097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-28 21:20:37 +02:00
Laurent Destailleur
1bb1c2eb3e Fix test inverted on SOCIETE_DISABLE_PARENTCOMPANY 2022-09-28 19:45:14 +02:00
Alexandre SPANGARO
1edaa58d88 Use isModEnabled 2022-09-25 22:53:21 +02:00
Alexandre SPANGARO
93709349d2 Use isModEnabled 2022-09-25 06:32:24 +02:00
Alexandre SPANGARO
2a8b32ff98 Use isModEnabled 2022-09-25 06:06:06 +02:00
Philippe GRAND
32b37718c7 update code toward php8 compliance 2022-09-24 14:55:10 +02:00
Frédéric FRANCE
d3dce05268
add debug in thirdparty merge 2022-09-13 15:44:54 +02:00
Philippe GRAND
236b86bdd3 update code toward php8 compliance 2022-09-10 11:18:31 +02:00
Philippe GRAND
b52bcf191f update code toward php8 compliance 2022-09-10 11:08:36 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022
update code
2022-09-09 18:03:43 +02:00
Laurent Destailleur
59b1e01d02
Merge pull request #21942 from ptibogxiv/patch-43
NEW manage no email with thirdparties (better for GDPR)
2022-09-07 14:24:52 +02:00
Laurent Destailleur
56f1964c68
Update card.php 2022-09-07 14:23:24 +02:00
Laurent Destailleur
ea6f751fd3
Update card.php 2022-09-07 14:21:36 +02:00
Philippe GRAND
36f2c139e5 update code 2022-09-04 13:33:11 +02:00
Philippe GRAND
a8531a4afd update code 2022-09-04 13:26:49 +02:00
Philippe GRAND
402d52e160 update code 2022-09-04 13:25:54 +02:00
Philippe GRAND
8108a60aac Update code 2022-09-03 11:32:24 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
UT from dolibit
ad42d6b796
Update card.php 2022-08-29 18:03:39 +02:00
stickler-ci
747db835ae Fixing style errors. 2022-08-29 12:47:01 +00:00
ptibogxiv
9d74c5c776 wip 2022-08-29 14:46:26 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Laurent Destailleur
def8b1c7a6 Fix if SOCIETE_DISABLE_PARENTCOMPANY on, we must not show_subsidiaries 2022-08-23 01:03:43 +02:00
Laurent Destailleur
7518f3b84c Fix if SOCIETE_DISABLE_PARENTCOMPANY on, we must not show_subsidiaries 2022-08-23 01:02:09 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
2022-07-28 02:36:57 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
bd0d932213 Protection when a category has a parent that is category with other type 2022-07-25 18:37:55 +02:00
Laurent Destailleur
96b7735bbe
Merge pull request #21567 from emheyarssi/15.0
FIX #21518
2022-07-24 20:08:11 +02:00
stickler-ci
bd88c9e0cd Fixing style errors. 2022-07-24 13:15:39 +00:00
marc
d8dfe360ec Fix #21518
delete old logo/photo from disk when load a new logo/photo
2022-07-24 15:03:32 +02:00
marc
9209c83054 Fix deleting logo/photo doesn't delete file from disk 2022-07-24 14:49:57 +02:00
Laurent Destailleur
8edebcf314 FIX Debug v16 2022-07-18 13:17:46 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
076d93452f FIX Debug v16 2022-07-18 11:59:22 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00