Commit Graph

77671 Commits

Author SHA1 Message Date
Laurent Destailleur
86e4ca55df Merge 2019-10-16 14:04:54 +02:00
Laurent Destailleur
81cb88721a
Merge pull request #12146 from aspangaro/10.0_p27
Fix - Accountancy - Various payment - Subledger is not recovered in bank journal
2019-10-16 13:19:46 +02:00
Juanjo Menent
5a1682509b FIX It is not possible to create an expedition if there is no unit data 2019-10-16 11:11:34 +02:00
Alexandre SPANGARO
4bb1677079 Fix - Accountancy - Various payment - Subledger is not recovered in bank journal 2019-10-16 10:39:35 +02:00
Laurent Destailleur
a45ad29e71 Doc 2019-10-15 11:32:53 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +02:00
Laurent Destailleur
ee5fdc3239 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 23:52:58 +02:00
Laurent Destailleur
0fe3159a8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/list.php
2019-10-14 23:52:46 +02:00
Laurent Destailleur
94aa98beed
Merge pull request #12131 from frederic34/patch-21
FIX Sort on total without tax on supplier invoices list
2019-10-14 21:25:13 +02:00
Laurent Destailleur
9f61bd23ce
Merge pull request #12127 from atm-josselin/FIX_product_batch_fields_definition
Fix : add fields definition in product batch class
2019-10-14 21:22:24 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25
Remove a duplicate line
2019-10-14 21:04:22 +02:00
Laurent Destailleur
d87a1e39a6
Merge pull request #12110 from aspangaro/10.0_holiday
lang file for holidays is holiday
2019-10-14 21:03:55 +02:00
Laurent Destailleur
3432147385
Merge pull request #12099 from prietojc/patch-11
FIX: Update card.php
2019-10-14 21:02:04 +02:00
Laurent Destailleur
2e7cc67f9c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 20:42:28 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
ed0e090d91
Merge pull request #12123 from atm-greg/FIX_blocked_log_missing_lib
add security.lib.php for dol_hash
2019-10-14 20:37:19 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php 2019-10-14 20:30:31 +02:00
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +02:00
atm-greg
92c624daf0 add security.lib.php for dol_hash 2019-10-14 15:28:06 +02:00
Laurent Destailleur
b4827dbe06 Prepare 10.0.3 2019-10-14 12:30:26 +02:00
Laurent Destailleur
4fd12e22cb Fix trans export 2019-10-14 12:27:44 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
650cd2b54f Prepare 10.0.3 2019-10-12 18:41:33 +02:00
Laurent Destailleur
9c94ffeea9 Fix css 2019-10-12 18:40:41 +02:00
Laurent Destailleur
67d76787eb Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT 2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Laurent Destailleur
a35173973c
Merge pull request #12102 from frederic34/patch-13
fix translation for showemailing
2019-10-12 03:26:46 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing
in lang files, it's ShowEMailing not ShowEmailing
2019-10-11 23:54:05 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
JC Prieto
d109341ebe
Update card.php
Variable $mesg not do anything
2019-10-11 18:08:15 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
a6fd864145
Merge pull request #12075 from frederic34/patch-13
doxygen
2019-10-11 15:52:11 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
Laurent Destailleur
85a4bac9e0 Better translation 2019-10-11 15:22:12 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
c3aba5f1a3 FIX #12083 2019-10-11 14:53:30 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
f2d04fe55c Code comment 2019-10-09 11:51:10 +02:00
Laurent Destailleur
9da1d5025b FIX If product account not suggested during bind, it is not preselected 2019-10-09 03:15:29 +02:00
Laurent Destailleur
9f4aadae18 Missing Nature, Duration and Type fields in export of products 2019-10-09 02:05:20 +02:00
Laurent Destailleur
1c105718b9 Update demo 2019-10-08 21:06:09 +02:00
Laurent Destailleur
6de31f2c54 Better translation 2019-10-08 19:35:50 +02:00
Laurent Destailleur
8921a103c1 Trans 2019-10-08 19:25:54 +02:00
Laurent Destailleur
7377c30bfe Fix limit 2019-10-08 13:17:13 +02:00
Laurent Destailleur
73422b2149 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-08 13:15:05 +02:00
Laurent Destailleur
760783b98b FIX #11942 2019-10-08 13:14:51 +02:00