Commit Graph

1645 Commits

Author SHA1 Message Date
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
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Nicolas Domenech
9d927973a7 fix: redirection after creation contact 2021-10-23 10:32:50 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Florian HENRY
1f1e01aa88 fix php 8 warning 2021-10-22 23:38:35 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
ff56415c00 Merge pull request #18903 from aspangaro/15a21
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
9ba7f019ea Fix css 2021-09-21 16:53:29 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
a57e8a14b8 Fix look and feel v14 2021-09-06 12:56:33 +02:00
Laurent Destailleur
38bd5e0902 Fix trans 2021-09-06 12:51:40 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Laurent Destailleur
27f7ef5270 Merge pull request #18515 from mbinformatique68/develop
NEW Added address field into contacts list
2021-08-28 16:14:35 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
mbinformatique68
ac803f7247 NEW Added address field into contacts list 2021-08-26 14:36:12 +02:00
Laurent Destailleur
22339a3ed3 Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
d91051488c Merge pull request #18125 from fr69400/develop
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
d485d9d2fd Update note.php 2021-07-11 09:45:59 +02:00