Frédéric FRANCE
c8640f329e
add missing global
2022-02-15 18:31:05 +01:00
Laurent Destailleur
ba77700619
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea
Fix css
2022-02-02 17:57:20 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab
2022-01-25 15:58:54 +01:00
Laurent Destailleur
8cb5264928
Fix css
2022-01-15 12:56:19 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Laurent Destailleur
1a5e594e59
Fix missing morehtmlref on some tabs
2022-01-10 00:33:54 +01:00
Laurent Destailleur
2a2a8b47d8
Fix link to vcard on contact
2022-01-09 20:43:26 +01:00
Laurent Destailleur
ae6ce0127b
css
2022-01-05 22:07:58 +01:00
Laurent Destailleur
5b8d6e60e4
Debug v15
2022-01-05 10:43:05 +01:00
stickler-ci
f0677ed665
Fixing style errors.
2022-01-04 09:42:24 +00:00
Quentin VIAL-GOUTEYRON
b1f750ac2f
NEW: Project contact tab
2022-01-04 10:35:44 +01:00
Laurent Destailleur
ef56631c80
FIX #yogosha8186
2022-01-03 18:15:19 +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
Laurent Destailleur
d4501a6f67
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
e47e3b9797
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-12-08 18:09:55 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
9b65bb2085
Update list.php
2021-12-08 15:29:16 +01:00
atm-gregr
01893caa61
bad default value
2021-12-08 14:40:46 +01:00
atm-gregr
386771cffc
fix display contat line on list
2021-12-08 14:21:42 +01:00
Marc de Lima Lucio
6af2626f08
FIX: contact card: bad colspan value for separator extrafield in creation/modification form
2021-12-06 16:55:51 +01:00
Quentin VIAL-GOUTEYRON
826bde0656
FIX set optional from post
2021-12-06 11:19:12 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
...
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
5e55bb20e3
Update note.php
2021-11-30 12:21:21 +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
36eb79c14d
Fix filter on "Refuse emailing"
2021-11-28 16:49:13 +01:00
bomuux
a3315e8e16
contact/note.php always restricted for external users
...
Case of external user :
1- restrictedArea always block the access,
2- if this weren't the case, the following code is obviously wrong : fetching a Contact from a Societe id...
2021-11-22 16:17:49 +01:00
Laurent Destailleur
48d7378282
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Florian HENRY
47da6793c5
FIX: contact not listed if module mainling not active and contact has no email
2021-11-16 13:31:51 +01:00
Regis Houssin
c5d70477c3
FIX compatibility with php8
2021-11-12 16:53:00 +01:00
Regis Houssin
3fb0e3c5ad
NEW add html.formldap.class.php
2021-11-03 22:56:15 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server
...
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8
2021-10-31 17:54:32 +01:00
Regis Houssin
f497492e62
FIX compatibility with php8
2021-10-28 15:40:05 +02:00
Laurent Destailleur
4e844b4687
Fix phpcs
2021-10-26 20:45:00 +02:00
Laurent Destailleur
7cd09eb649
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 16:34:25 +02:00
Laurent Destailleur
7393abea8f
Fix phpcs
2021-10-26 14:42:26 +02:00
Laurent Destailleur
e9ba9fc103
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/product/card.php
htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Florian HENRY
52a4f4869d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-25 16:54:30 +02:00
Laurent Destailleur
ad2e567571
Fix bug huntr.dev
2021-10-25 15:32:10 +02:00
Florian HENRY
b282673f61
fix php8 warning
2021-10-25 09:01:05 +02:00
Maxime Kohlhaas
983e28691b
Use a subselect instead of a join
2021-10-24 00:02:55 +02:00
Laurent Destailleur
f5cea6d312
Merge pull request #19154 from Hystepik/develop#3
...
Fix : fix php 8.0 warnings
2021-10-23 22:37:50 +02:00
Maxime Kohlhaas
00b617d17f
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
2021-10-23 22:22:45 +02:00
Laurent Destailleur
bc353c19a9
Update card.php
2021-10-23 19:22:41 +02:00