Commit Graph

22877 Commits

Author SHA1 Message Date
Laurent Destailleur
e0785ac5ef Update html.formmail.class.php 2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c Update html.formmail.class.php 2021-02-26 10:30:30 +01:00
daraelmin
5d31a93bf0 Fix #16420 - undefined $model_mail_selected_id
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Regis Houssin
0a3d1ab92e FIX use var "saved_url" instead global var "$url" 2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into
fix_avoid_missing_url_and_token

Conflicts:
	htdocs/core/js/lib_head.js.php
2021-02-23 16:55:32 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00
Laurent Destailleur
d2e1f9fce9 FIX #16096 #16085 Any call of ajax pages must provide the token 2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 11:10:32 +01:00
Laurent Destailleur
34dcebea78 Code comment 2021-02-23 11:03:34 +01:00
Regis Houssin
7c32e43c68 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 08:19:18 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
eee936b91c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
daraelmin
52dce616b9 FIX 16165 Create customer discount without vat 2021-02-19 18:03:36 +01:00
Laurent Destailleur
3a073c75e7 Too verbose 2021-02-19 18:01:47 +01:00
Florian HENRY
e46d4ee75d fix sample product import files 2021-02-19 18:01:36 +01:00
Florian HENRY
f111302a25 fix column count 2021-02-19 18:01:25 +01:00
Florian HENRY
32a360dd2a fix sample xls file 2021-02-19 18:01:16 +01:00
Florian HENRY
527c32d79e with new phpoffice col start at 1 not 0 2021-02-19 18:01:04 +01:00
Laurent Destailleur
574c0df427 Merge pull request #16338 from aspangaro/13p5
Fix module asset in development
2021-02-19 16:05:35 +01:00
Laurent Destailleur
ceccf85919 Merge pull request #16342 from frederic34/patch-3
fix unknown variable
2021-02-19 12:40:54 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Frédéric FRANCE
cc6a7d4834 fix unknown variable 2021-02-18 09:05:44 +01:00
Laurent Destailleur
a81e4d4daa Fix bad picto 2021-02-16 13:21:18 +01:00
Laurent Destailleur
54640199af Fix deletion if permission on dir is not write. 2021-02-15 23:43:56 +01:00
Laurent Destailleur
dabf9d796a FIX Rename title of template invoice 2021-02-15 22:16:01 +01:00
Laurent Destailleur
00642ffb48 Fix label of invoice 2021-02-15 22:04:35 +01:00
Laurent Destailleur
7bbb603859 Fix default template for contract can be empty 2021-02-15 21:46:07 +01:00
Laurent Destailleur
1b69456216 Complete response 2021-02-15 13:00:21 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Laurent Destailleur
4a2cd0d509 Merge pull request #16253 from AlexisLaurier/13.0
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Laurent Destailleur
1b11d9d0e9 FIX payment term label on PDF 2021-02-11 17:48:53 +01:00
Laurent Destailleur
8b125d8076 Fix MVC. Actions must be before output. 2021-02-10 16:44:20 +01:00
Laurent Destailleur
0849ce288c Fix phpcs 2021-02-10 14:04:06 +01:00
Alexis LAURIER
5b2779a5f9 contract - use multidir_output 2021-02-10 13:27:42 +01:00
Alexis LAURIER
05b1171e90 Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0 2021-02-10 13:19:47 +01:00
Alexis LAURIER
468f40743d contract - use multidir_output 2021-02-10 13:18:55 +01:00
LAURIER Alexis
cb4295b702 dol_check_secure_access_document contrat multidir_
Use multidir_output for contracts document check to manage entity on each contract
2021-02-10 13:02:13 +01:00
Laurent Destailleur
4f2e7c51fc Fix #16129 autodetect language on public pages 2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6 FIX #16129 2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
667963094f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
2c30680157 Merge pull request #16244 from AlexisLaurier/13.0
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
LAURIER Alexis
0ae0eb5758 fix regression of #16118 - entity not check
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
2021-02-09 20:13:13 +01:00
Frédéric FRANCE
71a2c20d4b massaction validate invoice do not regenerate pdf 2021-02-09 14:32:04 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
2021-02-08 17:25:05 +01:00
Laurent Destailleur
25823d7b90 Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
Add hidden conf to display supplier in object lines
2021-02-08 16:58:28 +01:00