lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,418 Commits 43 Branches 150 Tags 886 MiB
6c2d520e21
Commit Graph

92418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6c2d520e21 FIX caluclation of open days must not depends on TZ. 2020-12-05 17:41:05 +01:00
Laurent Destailleur
6023f2e16f Fix php8 2020-12-05 14:57:41 +01:00
Laurent Destailleur
991cfde0a2 Fix css 2020-12-05 14:46:29 +01:00
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
333449ca50 Fix security trans 2020-12-05 13:40:03 +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
Laurent Destailleur
aa1cb5cfa8 Fix lang load 2020-12-05 12:14:25 +01:00
Laurent Destailleur
fb3c4ab865 Clean returned object with APIs 2020-12-05 00:02:40 +01:00
Laurent Destailleur
9cfb0ac969 Clean API 2020-12-04 23:55:47 +01:00
Laurent Destailleur
613ed8bcfa FIX No use of $_SESSION into master.inc.php 2020-12-04 23:50:55 +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
9756fff02d
Merge pull request #15658 from frederic34/patch-8 
fix translation removing html
 2020-12-04 22:03:32 +01:00
Laurent Destailleur
8fe0f5fb40
Merge pull request #15647 from Hystepik/develop#4 
Fix #15646 : patch of this bug
 2020-12-04 21:59:13 +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
Frédéric FRANCE
4039ca269f
fix translation removing html 2020-12-04 21:08:51 +01:00
Laurent Destailleur
05a560c2e3 Fix warning 2020-12-04 20:43:11 +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
c1eb7e5dbb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 20:07:16 +01:00
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
aa853f9259 Debug v13 2020-12-04 20:02:04 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
Laurent Destailleur
67425abd29
Merge pull request #15602 from c3do/patch-18 
API orders: Update demand reason on order update
 2020-12-04 19:43:43 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +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
c1b6e58bbd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-04 19:12:22 +01:00
Laurent Destailleur
9cbdbc460d Fix multicurrency 2020-12-04 19:10:43 +01:00
Laurent Destailleur
49db52134b Fix for negative numbers 2020-12-04 18:19:51 +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
Laurent Destailleur
c69821794e
Merge pull request #15651 from fappels/11_fix_volume_calculation 
FIX product auto volume calculation
 2020-12-04 18:17:38 +01:00
Laurent Destailleur
aeda250df4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/install/mysql/data/llx_c_shipment_mode.sql
 2020-12-04 18:14:57 +01:00
Laurent Destailleur
283d4742f4 Merge branch 'FHenry-12.0_fix_fourn_commande_round' into 12.0 2020-12-04 18:13:29 +01:00
Laurent Destailleur
bc7cb4a148
Merge pull request #15640 from ATM-Consulting/FIX/12.0_Opensurvey_filters_by_entity_but_always_sets_entity_to_1 
FIX 12.0 - on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
 2020-12-04 18:11:24 +01:00
Laurent Destailleur
46bb49c490
Merge pull request #15638 from ptibogxiv/patch-396 
Fix limit product in customer margins
 2020-12-04 18:10:49 +01:00
stickler-ci
08e6fcad0d Fixing style errors. 2020-12-04 17:10:39 +00:00
Laurent Destailleur
628257d771
Merge pull request #15649 from atm-benoit/FIX_SUPPLIER_PROPOSAL 
Fix supplier proposal
 2020-12-04 18:06:08 +01:00
Frédéric FRANCE
b0e40aa215
fix type_user not define in left menu 2020-12-04 18:00:31 +01:00
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units 
surface_unit can be 0 for m2
 2020-12-04 16:54:40 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
Laurent Destailleur
6c8a6aa81f
Merge pull request #15641 from denis-poncereau/develop 
Corrected "cash fence" to "cash desk closing" on english .lang files
 2020-12-04 16:00:57 +01:00
Laurent Destailleur
2c9e490853
Merge pull request #15643 from atm-benoit/FIX_INSTALL_12_SHIP_MODE 
FIX SHIP MODE install v12 bug insert
 2020-12-04 15:58:44 +01:00
stickler-ci
ddf82f3e7a Fixing style errors. 2020-12-04 14:45:26 +00:00