Commit Graph

78410 Commits

Author SHA1 Message Date
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
Laurent Destailleur
201c3f87ca WIP Inventory module 2020-08-05 10:40:43 +02:00
bahfir abbes
6e16a8a544 fix: fetch reception on supplier order dispatch fetch 2020-08-05 08:36:27 +01:00
Egils Consulting
51ab0a5084 Update api_supplier_invoices.class.php
fixes #14831
2020-08-04 22:02:15 +02:00
Egils Consulting
a77b343db2 Update api_supplier_invoices.class.php
Unified names.
Renamed variable to an english name $paiementid => $payment_mode_id
Added hints where to look up the IDs needed.
2020-08-04 21:58:01 +02:00
Egils Consulting
3a9021f191 Update api_supplier_invoices.class.php
Fix order->invoice and clarify 403 error which is always caused by the invoice already being validated.
2020-08-04 21:47:39 +02:00
Laurent Destailleur
0ada919f65 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
2020-08-04 21:22:56 +02:00
Laurent Destailleur
04d18e2a68 css 2020-08-04 21:17:13 +02:00
Laurent Destailleur
eefa2bcaba FIX List of invoice waiting for direct debit 2020-08-04 21:12:28 +02:00
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
a3f7cbd63d css 2020-08-04 21:07:56 +02:00
Laurent Destailleur
84bdfc4bb7 FIX List of invoice waiting for direct debit 2020-08-04 21:06:38 +02:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Laurent Destailleur
d8da007e0e css 2020-08-04 18:50:57 +02:00
Philippe Grand
eed8957e07 Update pdf_blochet.class.php
The comment should be TCPDF and not PDF
2020-08-04 17:33:52 +02:00
Francis Appels
587ca48312 Fix filter warehouse list on status 2020-08-04 17:25:35 +02:00
Philippe Grand
8d2edfc5ab Update pdf_crabe.modules.php
The comment should be TCPDF and not PDF
2020-08-04 17:13:08 +02:00
Philippe Grand
8483d4609c Update pdf_rouget.modules.php
The comment should be TCPDF and not PDF
2020-08-04 17:05:32 +02:00
Philippe Grand
7e519da8df Update pdf_merou.modules.php
The comment should be TCPDF and not PDF
2020-08-04 17:00:59 +02:00
Philippe Grand
e368de9bba Update pdf_ban.modules.php 2020-08-04 16:55:47 +02:00