Philippe GRAND
9996c1ca7a
fix : invoid sql injection
2019-11-21 09:49:53 +01:00
Philippe GRAND
54d67de538
fix : invoid sql injection
2019-11-21 09:44:13 +01:00
Philippe GRAND
2c183fe279
fix : invoid sql injection
2019-11-21 09:22:44 +01:00
Tobias Sekan
f6c5605fd5
Fix number of tasks on dashboard always zero
2019-11-21 08:29:47 +01:00
Tobias Sekan
190dd6b1e9
Merge pull request #1 from Dolibarr/develop
...
merge current develop
2019-11-21 08:22:02 +01:00
Alexandre SPANGARO
2f064567ef
NEW Add shipment widget
2019-11-21 07:50:44 +01:00
Laurent Destailleur
f7319aeefb
Fix size of field
2019-11-20 18:50:03 +01:00
Laurent Destailleur
58c38912ab
Fix action into actionlogin to avoid conflict
2019-11-20 16:42:18 +01:00
VESSILLER
b7517377a7
FIX goup by unit label in product list
2019-11-20 15:00:34 +01:00
VESSILLER
38b083b766
FIX unit translate in product list if null
2019-11-20 14:43:29 +01:00
Laurent Destailleur
70882a749a
Fix responsive for md theme
2019-11-20 14:40:52 +01:00
VESSILLER
0a125f73b5
NEW add units in product list
2019-11-20 14:21:35 +01:00
Laurent Destailleur
849449517f
Fix responsive
2019-11-20 13:31:38 +01:00
Laurent Destailleur
f9092b1b8e
Fix responsive
2019-11-20 13:22:40 +01:00
Rüdiger Hahn
9018ec7eb2
Merge branch 'develop' into develop
2019-11-20 13:09:51 +01:00
ptibogxiv
f73bd0e0a6
FIX display job of contact list
...
can see différent contact with same name but different job
2019-11-20 13:07:26 +01:00
Rüdiger Hahn
db0d352af3
Use virtual stock when this has been configured
...
When "Use virtual stock by default, instead of physical stock, for replenishment feature" has been set in configuration, this should really be used. Otherwise only physically missing items will be shown in replenishment.
2019-11-20 12:53:23 +01:00
Laurent Destailleur
d7e8c71091
Look and feel v11
2019-11-20 12:45:15 +01:00
stickler-ci
3209d550c2
Fixing style errors.
2019-11-20 11:45:12 +00:00
ptibogxiv
2c810988a6
Update dolgraph.class.php
2019-11-20 12:43:49 +01:00
ptibogxiv
f1a9daf77e
NEW add total of value in product stat
2019-11-20 12:42:56 +01:00
ptibogxiv
789e751e4a
Update type.php
2019-11-20 10:55:58 +01:00
stickler-ci
54e528d659
Fixing style errors.
2019-11-20 09:38:32 +00:00
ptibogxiv
a3e7c4467a
NEW add WYSiWYG on member type's description
2019-11-20 10:36:26 +01:00
altairis
8522faea7f
add conf
2019-11-20 10:15:46 +01:00
Laurent Léonard
dbbcda9e99
Add WYSIWYG editor to description field of projects
2019-11-20 06:38:28 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Laurent Destailleur
1b53375371
Look and feel v11
2019-11-19 21:21:15 +01:00
Laurent Destailleur
07c01a821e
FIx #12466 manually (conflict pb)
2019-11-19 19:43:02 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
7dba9ecdf4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:22 +01:00
Laurent Destailleur
2f3b4d239b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:12 +01:00
John Botella
8f5c8c63df
Fix dom and showOptionals call
2019-11-19 16:35:31 +01:00
stickler-ci
c33506b4cc
Fixing style errors.
2019-11-19 13:41:30 +00:00
Cédric
8fbf853b94
Display attributes infos when get product variants
2019-11-19 14:40:50 +01:00
Laurent Destailleur
6bfb76d40d
Merge pull request #12464 from bb2a/patch-6
...
Update getfullname
2019-11-19 10:55:47 +01:00
Laurent Destailleur
ebd1f74b3b
Merge pull request #12469 from frederic34/patch-6
...
Update bookkeeping.class.php
2019-11-19 10:55:11 +01:00
Laurent Destailleur
3c09bbf739
Merge pull request #12468 from atm-florian/10.0
...
fix title page linked files user
2019-11-19 10:54:41 +01:00
Laurent Destailleur
49aa6ef9fa
Merge pull request #12467 from atm-greg/Fix_ContactCardCivility
...
fix bad getpost for civility_code in edit mode
2019-11-19 10:54:17 +01:00
Laurent Destailleur
66aa367851
Merge pull request #12465 from aspangaro/10.0_p9
...
Missing language key
2019-11-19 10:53:47 +01:00
Laurent Destailleur
6bee8b32f9
Merge pull request #12470 from Dolibarr/scrutinizer-patch-11
...
Scrutinizer Auto-Fixes
2019-11-19 10:53:27 +01:00
Scrutinizer Auto-Fixer
cd7523318d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
5b6f0cb101
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Frédéric FRANCE
b61a3f1ba9
Update bookkeeping.class.php
2019-11-18 19:59:21 +01:00
florian HENRY
010219bf09
fix title pasge linked files user
2019-11-18 19:47:34 +01:00
Laurent Destailleur
f696998093
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-11-18 19:02:25 +01:00
Laurent Destailleur
918f476c2b
Fix backport fix not checking mandatory extrafields of type select
2019-11-18 19:02:12 +01:00
Laurent Destailleur
fffc242484
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-18 18:09:25 +01:00
Laurent Destailleur
74c85b742e
Fix ref must be null until the generation of ref is ok
2019-11-18 18:09:12 +01:00
