lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,981 Commits 43 Branches 150 Tags 886 MiB
dc5557e4f7
Commit Graph

95981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
6e7172887a Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 22:58:00 +01:00
Florian HENRY
510c619c85 space 2021-01-05 22:56:55 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +01:00
Florian HENRY
939fecc611 add column payment mode terms shipping on order list 2021-01-05 20:32:29 +01:00
Florian HENRY
253349ced2 add column payment mode terms shipping on propal list 2021-01-05 20:23:45 +01:00
Frédéric FRANCE
58a4249222
clean code 2021-01-05 20:21:15 +01:00
Frédéric FRANCE
76d46652b7
doxygen 2021-01-05 20:17:26 +01:00
Laurent Destailleur
007ae59788 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:13:06 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Laurent Destailleur
01062c5940 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:12:22 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
Laurent Destailleur
5709216427
Merge pull request #15881 from OPEN-DSI/v11-fix-product-list-vat-rate-show-right 
FIX right to show VAT rate in product list
 2021-01-05 18:57:06 +01:00
Laurent Destailleur
a044d1b91f
Merge pull request #15880 from frederic34/api_bank_account 
fix unknown variable
 2021-01-05 18:55:35 +01:00
UT from dolibit
346bddf32f Update ChangeLog 
some minor changings
add info #15180
sorting
add info #14725
 2021-01-05 18:54:49 +01:00
Laurent Destailleur
65852b5734
Merge pull request #15882 from dolibit-ut/patch-59 
Update ChangeLog
 2021-01-05 18:54:21 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +01:00
Laurent Destailleur
84e6daa683
Merge pull request #15883 from dolibit-ut/patch-60 
Update check.php
 2021-01-05 18:52:30 +01:00
lmarcouiller
d88adb3d47 move line 553 of 12 to 13 migration to 13 to 14 2021-01-05 18:10:57 +01:00
UT from dolibit
19b8123ddf
Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:09:59 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
UT from dolibit
27b4627825
Update ChangeLog 
some minor changings
add info #15180
sorting
add info #14725
 2021-01-05 17:41:24 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
Florian HENRY
f953ff0334 fix sticker 2021-01-05 15:25:47 +01:00
Florian HENRY
a2a45c6aa0 fix sticker 2021-01-05 15:22:31 +01:00
Florian HENRY
92017931c3 get composer 2021-01-05 15:17:18 +01:00
Florian HENRY
763b76856c fix comoser 2021-01-05 15:13:57 +01:00
Florian HENRY
a3e56c0889 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-05 14:49:21 +01:00
Florian HENRY
27c32560c6 Merge develop 2021-01-05 14:46:50 +01:00
Laurent Destailleur
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00
Laurent Destailleur
8dc4e5929c Fix var not defined 2021-01-05 12:43:57 +01:00
Laurent Destailleur
4b45c5e723 Trans 2021-01-05 12:29:13 +01:00
Frédéric FRANCE
554fbcb577
Merge remote-tracking branch 'upstream/develop' into api_bank_account 2021-01-05 12:03:20 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
2e04aa4e03 Fix warning 2021-01-05 11:29:40 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Laurent Destailleur
7dd1f28a5c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-05 10:40:10 +01:00
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +01:00
Regis Houssin
889d73d8e3 FIX avoid php8 warning 2021-01-05 10:16:24 +01:00
Regis Houssin
f845adf343 FIX use GETPOST before 2021-01-05 09:57:35 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Frédéric FRANCE
ff25003025
fix unknown variable 2021-01-05 08:59:46 +01:00
Laurent Destailleur
64b4f1079d Close #15870 manually 2021-01-05 02:23:38 +01:00
Laurent Destailleur
8afe9b3aa5
Merge pull request #15876 from zuiko/patch-5 
Fix #15849 on V12 branch
 2021-01-05 02:03:00 +01:00
Laurent Destailleur
dc1faca816
Merge branch 'develop' into patch-5 2021-01-05 02:01:51 +01:00
Alexandre SPANGARO
9cea8b8244 FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment 2021-01-05 01:56:24 +01:00
Laurent Destailleur
702d8f9f37 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into 
develop

Conflicts:
	htdocs/theme/eldy/info-box.inc.php
 2021-01-05 01:48:25 +01:00
Laurent Destailleur
dcda3ec4b0
Merge pull request #15872 from aspangaro/13b6 
FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment
 2021-01-05 01:41:57 +01:00
Laurent Destailleur
7efd8add39
Merge pull request #15878 from frederic34/patch-10 
doxygen
 2021-01-05 01:41:02 +01:00