Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 20:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,358 Commits 36 Branches 191 Tags
40f2d884ddef99ed55ced3502b95e7e00a7bfa58
Commit Graph

93358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
UT from dolibit
40f2d884dd Update ChangeLog 
sorting TakePOS changelogs
minor edits
 2021-01-06 13:09:42 +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
UT from dolibit
19b8123ddf Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:09:59 +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
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
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
Laurent Destailleur
62315462e0 Merge pull request #15877 from frederic34/patch-8 
doxygen
 2021-01-05 01:40:45 +01:00
Frédéric FRANCE
eeaac549e2 doxygen 2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c doxygen 2021-01-04 23:41:20 +01:00
zuiko
0efd5934f4 Update fournisseurs.php 
FIX #15849
 2021-01-04 21:56:47 +01:00
zuiko
dd55f9ca91 update objectline_create.tpl.php 
FIX #15849
 2021-01-04 21:46:47 +01:00
Laurent Destailleur
f8fe7b5a0e FIX #15851 2021-01-04 16:38:09 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Alexandre SPANGARO
62d91c3631 FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment 2021-01-04 16:07:47 +01:00
Laurent Destailleur
07a3367f52 Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline 
Create/Edit extra-field computed value with multi-line text area
 2021-01-04 15:57:50 +01:00
Laurent Destailleur
e488f94af3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
243a3f9680 Merge pull request #15852 from aspangaro/14a8 
NEW: Add total in agent margin & uniformize code
 2021-01-04 14:09:59 +01:00
Laurent Destailleur
b3142c3250 Merge pull request #15859 from frederic34/htmlformmail_doxygen 
doxygen
 2021-01-04 14:08:51 +01:00
Laurent Destailleur
00cb253873 Merge pull request #15858 from frederic34/patch-10 
syntax error
 2021-01-04 14:07:56 +01:00
Laurent Destailleur
00d7bbc30d Merge pull request #15857 from frederic34/patch-8 
doxygen
 2021-01-04 14:07:32 +01:00
Laurent Destailleur
4d09d3a576 Merge pull request #15860 from fappels/13_debug_shipments 
Some debug on Shipments and reception.
 2021-01-04 14:06:52 +01:00
Laurent Destailleur
485d363d79 Update doc 2021-01-04 14:03:00 +01:00
Laurent Destailleur
0b240453e9 NEW Upgrade Stripe PHP lib to 7.67.0 2021-01-04 13:56:52 +01:00