Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,381 Commits 36 Branches 189 Tags
61bca50fa62c0b51127e5802e3926f031afb9812
Commit Graph

21934 Commits

Author SHA1 Message Date
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
stickler-ci
ef78b85062 Fixing style errors. 2020-08-11 10:42:27 +00:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00
stickler-ci
3e168f9495 Fixing style errors. 2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894 set default unit to PRODUCT_USE_UNITS value 2020-08-10 15:39:05 +02:00
florian HENRY
c4d8a25c5a fix external module multidiroutput 2020-08-10 13:40:55 +02:00
Ferran Marcet
10df9777b5 FIX: Visualization rights correction on last modified contacts box 2020-08-10 09:53:20 +02:00
Philippe Grand
e7bea7c5ce Update pdf_cyan.modules.php 2020-08-08 15:34:38 +02:00
Philippe GRAND
fe24c2f8b8 fix undefined variable 2020-08-08 15:29:53 +02:00
Philippe GRAND
f35893ceb4 fix deprecated 2020-08-08 15:12:29 +02:00
Philippe GRAND
0603a3ef60 fix conflict 2020-08-08 15:00:13 +02:00
Philippe GRAND
d811934962 fix conflict 2020-08-08 14:57:43 +02:00
Laurent Destailleur
cab9f6daae Comment must be in english 2020-08-08 13:22:55 +02:00
asolslk
ea829913b0 Update accounting.lib.php 2020-08-08 19:07:55 +08:00
Laurent Destailleur
030df58fea Fix regression in sending emails 2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e Fix regression in sending emails 2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3 Fix regression in sending emails 2020-08-07 17:06:12 +02:00
Laurent Destailleur
0dda5ca4d6 Fix experimental 2020-08-07 16:27:09 +02:00
Laurent Destailleur
00804c1020 Complete fix for #14146 2020-08-07 15:19:26 +02:00
Laurent Destailleur
ada7b74ba1 Fix phpcs 2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a Merge pull request #14355 from fmarcet/10.0 
Fix: User can see events that are not assigned to it
 2020-08-07 14:54:39 +02:00
Laurent Destailleur
aa422ce4d7 Merge branch 'develop' into develop 2020-08-07 12:05:32 +02:00
Laurent Destailleur
d3b16374fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/fourn/class/api_supplier_invoices.class.php
 2020-08-07 12:00:52 +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
d8e38201d9 Merge pull request #14378 from grandoc/patch-5 
Update pdf_crabe.modules.php
 2020-08-07 11:42:12 +02:00
Laurent Destailleur
a2e4e2d3b2 Merge pull request #14380 from grandoc/patch-6 
Update pdf_blochet.class.php
 2020-08-07 11:41:44 +02:00
Laurent Destailleur
9320ba1b37 Merge pull request #14376 from grandoc/patch-3 
Update pdf_rouget.modules.php
 2020-08-07 11:41:28 +02:00
Laurent Destailleur
07564166c7 Merge pull request #14375 from grandoc/patch-2 
Update pdf_merou.modules.php
 2020-08-07 10:11:16 +02:00
Laurent Destailleur
84c80e50a0 Merge pull request #14374 from grandoc/patch-1 
Update pdf_ban.modules.php
 2020-08-07 10:10:58 +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
8b69dd1384 Increase length of default password. 2020-08-07 09:50:15 +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
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
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