Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

120 Commits

Author SHA1 Message Date
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Florian HENRY
11bbd2ace3 fix: bad GETPOST test on payment module configuration 2021-05-28 10:31:54 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
1ffc598bef Use placeholder 2021-03-23 18:15:12 +01:00
Laurent Destailleur
3a463ac061 FIX #yogosha5723 2021-03-23 17:46:06 +01:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
f3af16f208 Typo 2021-01-28 22:30:13 +01:00
ptibogxiv
25de393685 Update stripe.php 2021-01-24 13:38:23 +01:00
ptibogxiv
4857a04acd ADD new payment method for stripe 
still in development (work for support more payment modes)
 2021-01-24 13:37:05 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
ad1d60740b Fix string 2020-09-20 18:05:49 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
7cbc621f6b css 2020-09-14 19:00:18 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
f6555a9077 Look and feel v12 2020-09-14 14:46:38 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
Laurent Destailleur
837697b234 Try to merge manually PR #12500 2020-09-05 14:14:56 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41: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
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
d4ae8b81e4 Card examples 2020-02-03 20:49:21 +01: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
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01: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
Laurent Destailleur
5eb24ba240 Fix phpcs 2019-11-26 11:55:34 +01:00
Laurent Destailleur
953ba8e323 Trans 2019-11-26 09:36:32 +01:00
Laurent Destailleur
cd6e81c46f Choice of a parameter is lost when saving 2019-11-26 09:34:42 +01:00
Laurent Destailleur
1b53375371 Look and feel v11 2019-11-19 21:21:15 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
ptibogxiv
2d34a0c4c1 Fix table in admin stripe.php 2019-08-02 14:48:45 +02:00
ptibogxiv
d2bc3ac1ef FIX stripe webhook ID constant set 2019-07-29 18:34:21 +02:00
Laurent Destailleur
4e26eefe6e Fix field not mandatory 2019-07-28 22:57:07 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
ptibogxiv
5e06a2497d Fix list of webhook for stripe 2019-05-10 00:39:34 +02:00
ptibogxiv
d09de303d2 Update stripe.php 2019-05-02 14:38:18 +02:00
ptibogxiv
4a83036a8e Update stripe.php 2019-05-02 13:38:47 +02:00
ptibogxiv
b2d54662a1 FIX : https in stripe webhook/ipn url 2019-05-02 13:34:34 +02:00