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

75511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f81a1a3e85 Complete examples 2019-04-26 03:50:05 +02:00
Laurent Destailleur
653790fb5d Clean code 2019-04-26 03:11:46 +02:00
Laurent Destailleur
5b9716b9d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-26 02:06:10 +02:00
Laurent Destailleur
85059eeedb Debug method getPaymentIntent 2019-04-26 02:05:57 +02:00
Laurent Destailleur
8c6dedd851
Merge pull request #11072 from ptibogxiv/patch-157 
FIX : sync data thirdparty to member
 2019-04-26 01:31:44 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
 2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
01075081cb FIX CVE-2019-11200 2019-04-25 22:25:19 +02:00
Laurent Destailleur
1dd8d9fa8f Fix phpcs 2019-04-25 21:48:35 +02:00
Laurent Destailleur
e332288e73 Fix concat 2019-04-25 19:46:20 +02:00
Laurent Destailleur
b2614259e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-25 19:32:58 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
ptibogxiv
23f4536a78
FIX : sync data thirdparty to member 2019-04-25 19:22:14 +02:00
Laurent Destailleur
c76c0e6fd0
Merge pull request #11071 from OPEN-DSI/fix-fourn--orderstoinvoice-reglement 
Fix default payment terms and method
 2019-04-25 19:03:58 +02:00
Laurent Destailleur
ad50aa2e79
Merge pull request #11070 from ptibogxiv/patch-156 
Fix display type in subscription list
 2019-04-25 19:02:25 +02:00
Laurent Destailleur
4353925d95
Update subscription.php 2019-04-25 19:02:16 +02:00
Laurent Destailleur
68926e3b6f
Merge pull request #11066 from aspangaro/10.0_accountancy7 
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
 2019-04-25 18:59:17 +02:00
Laurent Destailleur
06d8ecde8b
Merge pull request #11068 from ptibogxiv/patch-155 
Fix morphy type adherent
 2019-04-25 18:58:21 +02:00
Lionel VESSILLER
e80436469f Fix default payment condition and method 2019-04-25 16:05:12 +02:00
ptibogxiv
2968921f87
Fix display type in subscription 2019-04-25 13:12:33 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
ptibogxiv
cb658dda8c
Fix morphy type adherent 2019-04-25 12:04:26 +02:00
Laurent Destailleur
e08959484d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-25 11:18:36 +02:00
Laurent Destailleur
6fe84a7962 Fix phpcs 2019-04-25 11:18:25 +02:00
Laurent Destailleur
7fe28d6c5f
Merge pull request #11067 from ptibogxiv/patch-154 
Fix get morphy adherent type
 2019-04-25 11:17:29 +02:00
ptibogxiv
65bb7d9031
Update adherent_type.class.php 2019-04-25 09:37:07 +02:00
ptibogxiv
6190e7813e
Fix get morphy adherent type 2019-04-25 09:14:51 +02:00
Alexandre SPANGARO
2c411310bc FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries) 2019-04-25 08:29:43 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146 
NEW morphy value in member type
 2019-04-25 03:00:25 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
a15f1350be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:39:02 +02:00
Laurent Destailleur
50a4d54d8a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:32 +02:00
Laurent Destailleur
07caf22647 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:25 +02:00
Laurent Destailleur
becf096bf8 FIX ref for table without ref manager are set to NULL. 2019-04-25 01:37:08 +02:00
Laurent Destailleur
82093f5891 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:27:02 +02:00
Laurent Destailleur
560b026d68 Fix CSS 2019-04-25 01:26:29 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
aa9184905a FIX Duration is lost when editing 2019-04-25 00:11:08 +02:00
Laurent Destailleur
2e277d643d Stabilize code to prepare beta freeze. 2019-04-24 21:26:58 +02:00
Laurent Destailleur
b8a72cec2f
Merge pull request #11062 from ptibogxiv/patch-153 
FIX: enhancement management of webhooks
 2019-04-24 21:13:01 +02:00
Laurent Destailleur
77f92a5da3
Update stripe.php 2019-04-24 21:12:43 +02:00
Laurent Destailleur
8007b222d0
Merge branch 'develop' into patch-153 2019-04-24 21:10:27 +02:00
Laurent Destailleur
b62323939e
Merge pull request #11064 from atm-greg/FIX_create_supplier_invoice_button 
FIX test to display create invoice button on supplier_order card
 2019-04-24 21:07:15 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
b90613c6c4 Start debug IPN. Removed duplicate code. We will have to use existing 
code to not loose features.
 2019-04-24 20:21:03 +02:00
Laurent Destailleur
8d28506595 Better code 2019-04-24 19:25:04 +02:00
Laurent Destailleur
79c37f2226 Fix link for endpoint 2019-04-24 18:47:11 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
5a0d2bbcb4
Merge pull request #10634 from ptibogxiv/patch-120 
Update stripe version api for payment intent
 2019-04-24 18:08:04 +02:00
ptibogxiv
0583cf7804
Update adherent_type.class.php 2019-04-24 15:44:57 +02:00