Commit Graph

101785 Commits

Author SHA1 Message Date
Laurent Destailleur
5221c9e38f Fix editline 2021-10-17 19:41:17 +02:00
Laurent Destailleur
7bcc76c1aa Fix margin rates and mark rates are 2 different columns 2021-10-17 19:41:02 +02:00
Laurent Destailleur
78523e852d css 2021-10-17 14:04:49 +02:00
Laurent Destailleur
30d25bcb52 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-17 14:03:07 +02:00
Laurent Destailleur
30ba753b34 css 2021-10-17 14:02:37 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5
Fix the rounding issue in case of multi-currency
2021-10-17 13:50:35 +02:00
Laurent Destailleur
7bfad108a8
Merge pull request #18995 from aspangaro/14p11
FIX User salary card - translation problem
2021-10-17 13:49:44 +02:00
Laurent Destailleur
ccf78a1af4 FIX Use of accent into filename of GED 2021-10-17 12:30:08 +02:00
Laurent Destailleur
b30d7371a4 Fix allow ' - ' into file name 2021-10-17 12:21:22 +02:00
Alexandre SPANGARO
fb30136202 Translation 2021-10-17 08:12:28 +02:00
Alexandre SPANGARO
e9ecb2e1ee Translation 2021-10-17 08:11:34 +02:00
Alexandre SPANGARO
102c8a5772 FIX User salary card - translation problem 2021-10-17 08:02:28 +02:00
Laurent Destailleur
8bdece7101 CSS 2021-10-16 21:43:48 +02:00
Laurent Destailleur
ee6780c46e FIX #18968 2021-10-16 21:37:12 +02:00
Laurent Destailleur
68bb625ec7
Merge pull request #18976 from PyroShape/142
FIX : #18634 : Problem of virtual stock with reception module enabled
2021-10-16 21:23:08 +02:00
Laurent Destailleur
1c07385aba
Update product.class.php 2021-10-16 21:22:53 +02:00
Laurent Destailleur
830e067eff Fix for tzuser 2021-10-16 21:03:47 +02:00
Laurent Destailleur
5a4383c9ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-16 20:07:19 +02:00
Laurent Destailleur
f2757a63a1 Clean code 2021-10-16 20:06:58 +02:00
Laurent Destailleur
308d408cd0
Merge pull request #18980 from OPEN-DSI/v14-fix-print-date-user-timezone
FIX user date timezone offset
2021-10-16 20:03:42 +02:00
Laurent Destailleur
2b5bc202fc
Merge pull request #18984 from henrynopo/patch-2
Supplier Invoice Payment List
2021-10-16 19:19:34 +02:00
Laurent Destailleur
46eed3767f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-16 12:54:05 +02:00
Laurent Destailleur
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/stats/index.php
2021-10-16 12:49:18 +02:00
Laurent Destailleur
a2733344e7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-16 12:33:32 +02:00
Laurent Destailleur
07052196e2 Fix popup message on sepa creation 2021-10-16 12:33:19 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
0cb1972674
Update card.php 2021-10-15 15:07:48 +08:00
Henry
316bc16634
Update card.php 2021-10-15 15:05:13 +08:00
Henry
3d62ee22d3
Supplier Invoice Payment List
fix the missing multicurrency payments and remainders
2021-10-15 11:13:40 +08:00
lvessiller
5d22eeeff2 FIX user date timezone offset 2021-10-14 16:06:22 +02:00
Laurent Destailleur
3875d26a2f Fix filter for supplierinvoice stats 2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080 Fix filter tag for supplier invoice statistics 2021-10-14 15:43:35 +02:00
Laurent Destailleur
bc230dbfc2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-14 12:00:33 +02:00
Laurent Destailleur
371c75e76a FIX list of categories in stats of supplier invoices 2021-10-14 11:58:21 +02:00
Benjamin Chantalat
3438a4a9f6 Add the module reception to the calcul of virtual stock 2021-10-14 09:33:26 +02:00
Laurent Destailleur
fe3e11a104
Merge pull request #18957 from OPEN-DSI/v14-fix-takepos-payment-style
FIX payment style and html5 tags
2021-10-12 16:45:56 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Laurent Destailleur
d75138b362
Merge pull request #18946 from atm-lena/13.0_FIX_HookCreateDictionaryFieldList_HTMLTRTag
Hook createDictionaryFieldList :  tr html tag to right place
2021-10-12 12:46:04 +02:00
Laurent Destailleur
3a7681c186
Merge pull request #18945 from PyroShape/14b
FIX : Remove not complete order from the virtual stock
2021-10-12 12:44:22 +02:00
Laurent Destailleur
2e32254574 Fix rul to shipment files 2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-11 20:18:46 +02:00
Laurent Destailleur
6b69e64fb6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-11 20:18:08 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Laurent Destailleur
3a32787f15 Fix for backward compatibility 2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1 Fix for backward compatibility 2021-10-11 16:13:55 +02:00
atm-lena
7c8bde885b hook createDictioaryFieldList : tr html tag to right place 2021-10-11 16:03:56 +02:00
Benjamin Chantalat
91164951de Remove not complete order from virtual stock 2021-10-11 15:24:56 +02:00
Laurent Destailleur
4fba60d2bb
Merge pull request #18925 from OPEN-DSI/v14-fix-cron-reload-user-langs
FIX reload user lang
2021-10-11 11:21:28 +02:00