Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
94,507 Commits 36 Branches 189 Tags
53295a0cb15f8a11f7ca367de76ec59afde58348
Commit Graph

22877 Commits

Author SHA1 Message Date
Laurent Destailleur
cb9d6318e7 Fix warning 2020-12-05 14:09:51 +01:00
Laurent Destailleur
15455690b9 Fix setup 2020-12-05 14:06:50 +01:00
Laurent Destailleur
5860bf69ce fix warning 2020-12-05 13:48:51 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before 
and after filefunc.inc.php.
 2020-12-05 13:26:58 +01:00
Frédéric FRANCE
325951877b fix missing fields in box 2020-12-05 08:58:20 +01:00
Frédéric FRANCE
e9a12b5324 fix missing fields in box 2020-12-05 08:56:17 +01:00
Laurent Destailleur
8455e03a08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 22:30:56 +01:00
Laurent Destailleur
af1bb09338 NEW: Graphics can be horizontal bars. 2020-12-04 22:30:34 +01:00
Laurent Destailleur
bb0c33a49e Merge pull request #15654 from frederic34/commonkanban 
keep common if wanted
 2020-12-04 22:25:51 +01:00
Laurent Destailleur
b9f7d9ab4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 22:12:43 +01:00
Laurent Destailleur
d8b01d9a33 Fix chart is default graph lib 2020-12-04 22:12:20 +01:00
Laurent Destailleur
a05021a344 Merge pull request #15653 from frederic34/typeusermenuleft 
fix type_user not defined in left menu
 2020-12-04 22:03:54 +01:00
Laurent Destailleur
c31cf08431 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modCategorie.class.php
 2020-12-04 21:55:57 +01:00
Laurent Destailleur
0536ed87a2 Avoid to process too large user agent 2020-12-04 21:38:33 +01:00
stickler-ci
d89970ddd1 Fixing style errors. 2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91 keep common if wanted 2020-12-04 20:28:05 +01:00
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Laurent Destailleur
e0b737b622 Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv 
pricetonum() - preg-replace() delete "-" negativ number
 2020-12-04 18:19:22 +01:00
stickler-ci
08e6fcad0d Fixing style errors. 2020-12-04 17:10:39 +00:00
Frédéric FRANCE
b0e40aa215 fix type_user not define in left menu 2020-12-04 18:00:31 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
Laurent Destailleur
f0dec80dae css 2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
stickler-ci
6a2d842d3e Fixing style errors. 2020-12-04 13:47:55 +00:00
lmarcouiller
9c191cda43 New #8172 : PHPExcel replace by PHPSpreadSheet 2020-12-04 14:28:09 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Frédéric FRANCE
e3037c7e1a doxygen 2020-12-03 17:33:22 +01:00
Laurent Destailleur
f06d920460 FIX #15583 2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
Laurent Destailleur
af4f473c93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_produits.php
 2020-12-03 11:22:34 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
lmarcouiller
28ac976438 Show won on graph 2020-12-03 11:14:58 +01:00
lmarcouiller
e08f6aeb2b Fix #15383 2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce Merge branch 'develop' into develop#3 2020-12-03 10:39:25 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Hystepik
ecb5a3b028 Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235 changes to not diplay won and lost and add on migration 2020-12-03 10:11:16 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Laurent Destailleur
ea1c55cf1e Fix widgets that has disappeared 2020-12-02 15:16:20 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
lmarcouiller
c7a31b2458 new widget funnel of prospection 2020-12-02 14:42:56 +01:00
Laurent Destailleur
25bedc3497 Fix warning 2020-12-02 14:09:03 +01:00
Laurent Destailleur
49be354c3e Fix warning 2020-12-02 14:05:17 +01:00