Commit Graph

82693 Commits

Author SHA1 Message Date
VESSILLER
8a348d533b NEW only show units columns in product list (not in service list) 2020-01-21 17:29:45 +01:00
VESSILLER
70122411eb FIX label Volume in comment 2020-01-21 11:02:14 +01:00
VESSILLER
0278cef2d7 NEW columns units in product list 2020-01-21 10:33:27 +01:00
Laurent Destailleur
4598538b42 Prepare PDF templates to use 2 languages for titles 2020-01-21 01:55:00 +01:00
Laurent Destailleur
acdb28ba25 Add country id and country code in substitution vars 2020-01-21 00:28:53 +01:00
Laurent Destailleur
d6e81c5da4 Fix var not defined 2020-01-21 00:20:18 +01:00
Laurent Destailleur
80483fc085 Fix init of specimen 2020-01-21 00:20:03 +01:00
Laurent Destailleur
5b86851cf3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1 Doc 2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
d465101ae3 Fix We should not be able to choose which permission to use to have
access to an object.
2020-01-20 14:29:02 +01:00
Laurent Destailleur
60fd1f5156 Fix bad entry in menu 2020-01-20 12:47:49 +01:00
Laurent Destailleur
5f64531e9b Fix look and feel v11 2020-01-20 12:39:25 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
969da828fa Debug inventory 2020-01-20 02:30:53 +01:00
Laurent Destailleur
b8938b8d19 Fix look and feel v11 2020-01-20 02:18:00 +01:00
Laurent Destailleur
206cfcd7fe Clean code for inventory 2020-01-20 02:07:47 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
Laurent Destailleur
7c5485288b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 20:34:20 +01:00
Laurent Destailleur
62b9fbb67f Fix link 2020-01-19 20:33:55 +01:00
Laurent Destailleur
6b6c9efe5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:56:21 +01:00
Laurent Destailleur
5a702eb50c Fix filter on amount 2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b Fix search 2020-01-19 19:51:40 +01:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
Laurent Destailleur
19ab802aaf Fix disabling of balance 2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f Fix link 2020-01-19 19:33:57 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Laurent Destailleur
8c8d492a48 FIX Protection to avoid blocking situation with negative lines 2020-01-19 15:19:07 +01:00
Laurent Destailleur
00cddc39fd Fix remove some orphelins in llx_ecm_files 2020-01-19 13:56:16 +01:00
Laurent Destailleur
8bc8a8f57c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-19 12:16:33 +01:00
Laurent Destailleur
f4ae869678 Fix error return when creating order with not enough stock 2020-01-19 12:15:47 +01:00
andreubisquerra
83d1b673bb Visible receipt printer settings without stock module in TakePOS 2020-01-18 20:22:54 +01:00
Laurent Destailleur
f09ca62e93
Merge pull request #12859 from andreubisquerra/master
Visible receipt printer settings without stock module in TakePOS
2020-01-18 20:22:31 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
45f322cce8 Fix error management in API 2020-01-18 20:17:21 +01:00
Laurent Destailleur
a1b03e094c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-18 19:53:58 +01:00
Laurent Destailleur
d9f7c4aec4 FIX #12838 2020-01-18 19:53:48 +01:00
Laurent Destailleur
df26bab65b FIX #12881 2020-01-18 19:52:59 +01:00
Laurent Destailleur
6edc22c1ad
Merge pull request #12884 from laudeco/hotfix/#12883_dlc_dluo_api
#12883 -  DLC and  DLUO in the stock movement api
2020-01-18 19:40:30 +01:00
Laurent Destailleur
3748da6ee3
Merge pull request #12882 from simnandez/11.0
FIX In third parties creation, when changing the country drop down, the states are not reloaded
2020-01-18 19:37:29 +01:00
Laurent Destailleur
178dd518cf
Merge branch 'develop' into scrutinizer-patch-5 2020-01-18 19:36:36 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
0873f2fec9 Fix $user not defined 2020-01-18 16:16:17 +01:00
Laurent Destailleur
957e797b61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-18 16:13:32 +01:00
Laurent Destailleur
73d56358e1 Fix bad param 2020-01-18 16:13:10 +01:00