Commit Graph

519 Commits

Author SHA1 Message Date
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
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
5c82e37517 Debug v16 2022-06-20 13:40:54 +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
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Laurent Destailleur
8315d9e10d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-15 14:21:02 +02:00
Laurent Destailleur
63dd080dea Fix phpcs 2022-06-15 14:19:26 +02:00
Frédéric FRANCE
70af9b548f
avoid extra space after idprof 2022-06-09 12:04:35 +02:00
Faustin
9731f0658a FIX #20444 2022-06-07 11:23:50 +02:00
Faustin
cd17fec00e FIX #20444 2022-06-07 10:40:44 +02:00
stickler-ci
ccfc730786 Fixing style errors. 2022-06-05 12:56:26 +00:00
Faustin
88cf8187b8 FIX #20444 2022-06-05 14:32:21 +02:00
Laurent Destailleur
9661342422 Disabled for beta 16. Will be analyzed later. 2022-05-20 23:00:25 +02:00
Laurent Destailleur
3794c8193d
Merge pull request #20573 from wdammak/patch-48
Avoid duplicate 3rd partires
2022-05-20 22:51:43 +02:00
Laurent Destailleur
9e2e3393c6 Work on popup create pages 2022-05-19 21:32:17 +02:00
Laurent Destailleur
2d16af1d31 Debug import wizard 2022-05-19 20:18:18 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
1a0e416c1a WIP 2022-05-18 00:51:20 +02:00
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Laurent Destailleur
2e6f4862f9 Fix creation of thirdparty when module supplier not enabled
NEw can use the clicktoclipboard feature when clicking on value
2022-05-10 10:57:51 +02:00
Laurent Destailleur
1438da022d
Merge pull request #20157 from atm-GregM/updateButtonsGregM
FIX: replace button with dolGetButtonAction on Societe card
2022-04-14 22:37:59 +02:00
wdammak
fb2243dacd
Update card.php 2022-04-14 16:19:55 +01:00
wdammak
db96173189
Update card.php 2022-04-13 18:00:24 +01:00
wdammak
88a6b65353
Update card.php
Add logo
2022-04-13 17:11:51 +01:00
stickler-ci
150a21820f Fixing style errors. 2022-04-13 00:14:23 +00:00
wdammak
5d9cfaa823
Update card.php 2022-04-13 01:09:44 +01:00
Laurent Destailleur
96c866400f css 2022-04-07 16:05:55 +02:00
Laurent Destailleur
b8d19c9311 Debug v16 2022-04-07 15:59:50 +02:00
Laurent Destailleur
bc7ad806e7 Try to fix a strange logic. 2022-04-07 15:01:20 +02:00
Laurent Destailleur
f2f2ce7d7c
Merge pull request #19555 from OPEN-DSI/fix-thirdparty-modify-tags-not-customer-prospect
FIX can modify tag in thirdparty card if const enabled
2022-04-07 14:45:59 +02:00
wdammak
51837690fe
Avoid duplicate 3rd partires 2022-04-07 01:10:29 +01:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00