Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
752143fdfd Merge pull request #14395 from andreubisquerra/master
FIX: TakePOS is not loading some specific customer taxes
2020-08-07 10:00:36 +02:00
Laurent Destailleur
16828b8cec Merge pull request #14403 from FHenry/12.0
fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)
2020-08-07 09:58:49 +02:00
Laurent Destailleur
60fe813d26 Merge pull request #14406 from egils-consulting/patch-2
Update api_supplier_orders.class.php
2020-08-07 09:55:05 +02:00
Laurent Destailleur
8b69dd1384 Increase length of default password. 2020-08-07 09:50:15 +02:00
Egils Consulting
9c254159ab Update api_products.class.php
fixes #14309 
Throw 400 and add hint to user about using the right endpoint.
2020-08-07 00:06:48 +02:00
Egils Consulting
20ea6d86d8 Update api_supplier_orders.class.php
Added example of creating a supplier order
2020-08-06 19:57:31 +02:00
Laurent Destailleur
edd19419ad Add protection to allow only jpg and png as image file 2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d Add protection to allow only jpg and png as image file 2020-08-06 17:37:00 +02:00
Laurent Destailleur
582ae36e6c Doc 2020-08-06 17:30:13 +02:00
Laurent Destailleur
c2b03e49e1 Fix logo not visible in setup page 2020-08-06 17:28:57 +02:00
Laurent Destailleur
dcec2516ae Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-06 17:16:21 +02:00
Laurent Destailleur
c6ee80eefd FIX Disable svg as supported image by default. Set
MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.
2020-08-06 17:16:09 +02:00
florian HENRY
46cafcc445 Merge branch '11.0' into 12.0 2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf Merge branch '10.0' into 11.0 2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method 2020-08-06 16:28:17 +02:00
Laurent Destailleur
e6c4c8082e Fix phpcs 2020-08-06 16:10:40 +02:00
Laurent Destailleur
561520b44c WIP Recruitment module 2020-08-06 16:06:15 +02:00
Laurent Destailleur
43b23994e4 WIP Recruitment module 2020-08-06 15:55:04 +02:00
quentin
215242a4a1 fix right project info.php 2020-08-06 14:11:26 +02:00
Laurent Destailleur
e830e7f3d3 Work on recruitment module 2020-08-06 13:14:43 +02:00
Laurent Destailleur
da59bb811f Fix backtopage after creating a bookmark 2020-08-06 12:29:57 +02:00
jove@bisquerra.com
25c37d9bca FIX: Get some taxes in TakePOS 2020-08-06 07:32:28 +02:00
Laurent Destailleur
37f1b27bd2 Fix phpcs 2020-08-06 03:55:47 +02:00
Laurent Destailleur
01babc452c More logs 2020-08-06 03:52:49 +02:00
Laurent Destailleur
cd89538ee9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-06 03:04:46 +02:00
Laurent Destailleur
5b0d04609c Fix number to string 2020-08-06 03:03:18 +02:00
Laurent Destailleur
b40177a8c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 03:00:16 +02:00
Laurent Destailleur
fbcf95ba02 Fix number to string 2020-08-06 02:59:46 +02:00
Laurent Destailleur
641d9a6565 Fix number to string 2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functionsnumtoword.lib.php
2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d Fix function to convert price to string 2020-08-06 02:50:24 +02:00
Laurent Destailleur
d2eb1cc47d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:20:49 +02:00
Laurent Destailleur
12b9a73ca5 Fix phpcs 2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
4785e84c43 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2020-08-06 02:10:17 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
ef0f7cfa6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
Laurent Destailleur
c8bff3a71e FIX Cannot redeclare class 2020-08-06 02:05:04 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment
FIX dol_convertToWord() Bad conversion of number into a string
2020-08-06 01:56:42 +02:00
Laurent Destailleur
8b4e153f81 Doc 2020-08-05 20:05:59 +02:00
Laurent Destailleur
24a9a5ac2d CSS 2020-08-05 19:42:36 +02:00
Laurent Destailleur
fb5b29a32b FIX Restore the links on late badge 2020-08-05 19:39:38 +02:00
spooky360
a94fa93973 Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr) 2020-08-05 17:11:19 +02:00
spooky360
b9513255fd Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr). 2020-08-05 17:02:59 +02:00
Laurent Destailleur
76624122dd Fix regression: Restore filter on "alerte" 2020-08-05 16:05:29 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Laurent Destailleur
0884678264 Look and feel v12 2020-08-05 11:10:38 +02:00