Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
88,321 Commits 36 Branches 189 Tags
16b69a069e64efb66d952f55ffa9b0f8db85f54d
Commit Graph

6380 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b FIX: allow more harmless html tags 2020-07-25 00:57:40 +02:00
Laurent Destailleur
3ed4773d7f Fix tab popup when there is 2 head tabs in same page 2020-07-24 18:31:14 +02:00
Laurent Destailleur
93fea8591c Fix phpcs 2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00