Commit Graph

578 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
e93f1cc507
Update card.php 2022-03-30 12:15:33 +02:00
GregM
114827934e Fix merge conflict 2022-02-23 15:51:44 +01:00
GregM
5efbe5a429 Merge branch 'develop' of github.com:Dolibarr/dolibarr into updateButtonsGregM 2022-02-23 15:44:04 +01:00
GregM
74bfdb0842 fix retour 2022-02-23 15:34:17 +01:00
GregM
b954608443 Update card 2022-02-23 12:09:15 +01:00
GregM
5dcb4c85ee fix dolGetButtonAction societe card 2022-02-23 10:03:48 +01:00
GregM
059548105c WIP dolGetButtonAction 2022-02-22 12:14:18 +01:00
GregM
b0473c475a wip dolGetButtonAction 2022-02-22 11:48:35 +01:00
GregM
69bb3aaad1 WIP dolGetButtonAction 2022-02-22 11:35:55 +01:00
GregM
b05a5d63b2 WIP dolGetButtonAction 2022-02-22 11:28:33 +01:00
GregM
b728ad871c WIP dolGetButtonAction 2022-02-22 10:06:05 +01:00
Alexandre SPANGARO
5a86f99890 FIX Disable customer type by default if type prospect/customer is disabled 2022-02-13 17:53:22 +01:00
habot-it
e0ba321365 Add parent company in action==add of societe card.php 2022-02-01 13:54:25 +00:00
Sylvain Legrand
b65f849c5d New - Improve the reading of profIDs 2022-01-28 11:22:12 +01:00
Laurent Destailleur
4ce77e62c6 Debug v15 2022-01-09 14:19:55 +01:00
atm-gregr
3feb3d5b76 double contactcategorie 2021-12-21 14:26:28 +01:00
Laurent Destailleur
f6f6537e25 css 2021-12-12 02:13:09 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
lvessiller
efc0251a66 FIX can modify tag in thirdparty card if const THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER enabled 2021-12-06 11:40:50 +01:00
Regis Houssin
202b123aaa FIX compatibility with multicompany 2021-12-02 15:10:29 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
72069dc208 Fix css 2021-10-29 11:35:09 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
2021-10-24 00:02:15 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Regis Houssin
452a8cfe18 FIX wrong position of error message 2021-10-23 10:27:24 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
ae1da43225
Update card.php 2021-10-20 11:30:38 +02:00
Laurent Destailleur
f59f605bcc
Update card.php 2021-10-20 11:29:34 +02:00
atm-florian
417daa4289 FIX 14.0 - civility field width inadequate due to select2 calculating the width while the field has no width (display: none) 2021-10-20 11:15:02 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
Alexandre SPANGARO
00eafcb6e7 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:50:22 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
1d2c8effd8 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:20:35 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
30c29f13c8 Fix go back on thirdparty file after Save 2021-09-03 13:19:37 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00