lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,412 Commits 43 Branches 150 Tags 886 MiB
0d59ac34d2
Commit Graph

6391 Commits

Author SHA1 Message Date
Bernard Saulme
52b84a3ea2
Update functions.lib.php 2020-08-14 18:08:59 +02:00
Laurent Destailleur
a916f6af59 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop 
Security Fix for Cross-site Scripting (XSS) - huntr.dev
 2020-08-14 03:17:35 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
Laurent Destailleur
ada7b74ba1 Fix phpcs 2020-08-07 14:56:30 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam 
FIX :  JS CRASH - bad usage of moreparam
 2020-08-07 10:10:09 +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
c2b03e49e1 Fix logo not visible in setup page 2020-08-06 17:28:57 +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
Laurent Destailleur
43b23994e4 WIP Recruitment module 2020-08-06 15:55:04 +02:00
Laurent Destailleur
37f1b27bd2 Fix phpcs 2020-08-06 03:55:47 +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
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
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
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
c09827248b
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default 
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
 2020-08-04 12:27:31 +02:00
Florian Mortgat
ce18a4f029 FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default 2020-08-03 12:28:12 +02:00
quentin
72b2fb442b fix test libelle 2020-08-03 11:17:39 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
04903460b1 Add contact on job page 2020-08-02 18:09:53 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
367914015c NEW Add a counter of number of words of pages in website module 2020-08-02 15:53:34 +02:00
Laurent Destailleur
d08c42a205 CSS Better visibility for buttons and status 2020-08-02 00:15:21 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
8b879ee23b FIX Edit extrafield of type long text loose carriage returns 2020-07-30 14:49:00 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
 2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags 
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
 2020-07-29 13:34:45 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
VERDOL Gauthier
25994e61bc FIX : We need to see unit line on PDF even though it's an option 2020-07-27 16:04:21 +02:00
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4 FIX Picto of HRM module 2020-07-26 20:51:49 +02:00