Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

449 Commits

Author SHA1 Message Date
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
f5f2ea57e3 Fix compatibility 2020-10-01 16:57:49 +02:00
Laurent Destailleur
a2efdee865 Fix after regression of #14886 2020-10-01 16:49:27 +02:00
Laurent Destailleur
2f89d526eb Avoid to get a random result. 2020-10-01 16:43:56 +02:00
ptibogxiv
3f78d8fe25 Update stripe.class.php 2020-10-01 12:19:12 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
665dc6f8d2 More fontawesome logo 2020-04-06 18:16:21 +02:00
Laurent Destailleur
39fba83f26 Add a right navigation on list of stripe charges 2020-03-30 15:56:14 +02:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
21d9b00fce Fix missing amount in table of prelevement 2020-02-13 00:05:01 +01:00
Laurent Destailleur
9667482ef2 Doc 2020-02-13 00:04:17 +01:00
Laurent Destailleur
138cf649df Fix missing amount in table of prelevement 2020-02-12 23:17:46 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
0b45ceaf92 More logs 2020-02-04 18:59:49 +01:00
Laurent Destailleur
d4ae8b81e4 Card examples 2020-02-03 20:49:21 +01:00
Laurent Destailleur
36461afea9 FIX Creation of Stripe card from backoffice must return a clean message 2020-02-03 14:55:02 +01:00
Laurent Destailleur
7b661e707e FIX Creation of Stripe card from backoffice must return a clean message 2020-02-03 14:54:35 +01:00
Laurent Destailleur
be0a25e5ed Removed never called page 2020-02-02 19:03:59 +01:00
Laurent Destailleur
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Laurent Destailleur
aaf83e418d Code comment 2020-01-31 15:27:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
d49534e646 Merge pull request #12546 from ptibogxiv/patch-285 
Upgrade Stripe - minimal stripe update for compatibility
 2020-01-29 23:04:25 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
ptibogxiv
5783f9b7c2 fix lang for other payment mode available 2020-01-28 17:33:50 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
ptibogxiv
63d9e3c01e fix list stripe charge.php 
payment intent use table_element so need double terms for more compatibility
 2020-01-27 15:11:22 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
999e363446 Update charge.php 2020-01-22 13:52:37 +01:00
ptibogxiv
b4758295e1 fix stripe/charge.php for connect mode with payment intent 2020-01-21 10:59:57 +01:00
Laurent Destailleur
6f97d163f9 Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
9aac612ed9 Fix sql error 2019-12-15 17:46:56 +01:00
Laurent Destailleur
a3736399da Fix to select correct record with compatibility with old record 2019-12-15 17:44:05 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
5835d49ae1 Merge pull request #12613 from ptibogxiv/patch-288 
Fix title of transactions list
 2019-12-03 13:22:02 +01:00
ptibogxiv
636da4518f Fix title of transactions list 2019-12-03 11:22:00 +01:00
ptibogxiv
15715aa12c FIX not fee in payout list 2019-12-02 23:53:01 +01:00
stickler-ci
4bd4719aa6 Fixing style errors. 2019-12-01 10:03:29 +00:00
Laurent Destailleur
4ed44140e7 Merge branch 'develop' into patch-285 2019-12-01 11:01:40 +01:00
ptibogxiv
753439efee Update stripe.php 2019-11-28 23:23:08 +01:00
ptibogxiv
b9c0f961c9 Update stripe.class.php 2019-11-28 22:17:49 +01:00
ptibogxiv
f6bc48e6d7 FIX minimal stripe update for compatibility 
cf https://stripe.com/guides/important-update-for-connect
 2019-11-28 22:13:11 +01:00