Commit Graph

78950 Commits

Author SHA1 Message Date
Laurent Destailleur
a5c43b42c3 Add a protection when we have several records 2019-08-23 13:28:26 +02:00
schhub
22c661be9f
Update stripe.class.php
removed space in line 95
2019-08-23 10:26:07 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
ptibogxiv
0afc55ab51
Update paymentmodes.php 2019-08-23 09:08:39 +02:00
ptibogxiv
c6bcf19a88
Fix phpcs 2019-08-23 09:01:05 +02:00
ptibogxiv
55d70004b1
Update paymentmodes.php 2019-08-23 09:00:11 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
schhub
3c706ae28a
Update dolibarr_export.php 2019-08-23 08:53:43 +02:00
schhub
264763f6b7
Update dolibarr_export.php 2019-08-23 08:31:50 +02:00
schhub
9d3b4eb699
Update dolibarr_export.php 2019-08-23 08:05:44 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
4536b8618e
Update paymentmodes.php 2019-08-22 22:48:37 +02:00
ptibogxiv
cef4bdab7b
NEW update / delete stripe account for supplier 2019-08-22 22:20:50 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Florian Mortgat
fa29415e6a Moved repair payload from a specific script to install/repair.php 2019-08-22 14:06:18 +02:00
schhub
5bab233252
Delete action correction for documents backup.
correction of delete action always trying to delete files in document/admin/backup directory. Documents backups are stored in documents/admin/documents directory. If preg_match is too "heavy" it can be replaced by strpos.
2019-08-22 13:19:45 +02:00
Laurent Destailleur
134c116021
Merge pull request #11715 from ptibogxiv/patch-226
NEW :  Platforme compliance with Stripe Connect
2019-08-22 12:54:09 +02:00
Laurent Destailleur
5983f08d73
Update stripe.class.php 2019-08-22 12:52:30 +02:00
Laurent Destailleur
209933e02e
Merge pull request #11716 from ptibogxiv/patch-227
FIx number of col for IBAN list
2019-08-22 12:45:46 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
2080f92ec2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-22 12:39:13 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
f7391879a2
Merge pull request #11713 from ptibogxiv/patch-225
Fix context in takepos
2019-08-22 11:50:46 +02:00
Laurent Destailleur
48361c481f
Merge pull request #11704 from defrance/patch-142
bad converting on php 7 is totalpaid is null
2019-08-22 11:50:30 +02:00
Laurent Destailleur
bc66be51a8
Update card.php 2019-08-22 11:50:18 +02:00
Laurent Destailleur
af72eb85f2
Merge pull request #11707 from OPEN-DSI/new-contrat-fetch-entity
Add entity in fetch method for contract
2019-08-22 11:48:12 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
5897fe52b3
Merge pull request #11722 from Dolibarr/revert-11685-patch-224
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
2019-08-22 11:29:09 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Laurent Destailleur
775dd18b22
Merge pull request #11712 from andreubisquerra/master
NEW Add 'Direct Cash Payment' button in TakePOS
2019-08-22 11:22:57 +02:00
Laurent Destailleur
9445c6aa10
Merge pull request #11721 from hregis/develop_menu
FIX add $context parameter in checkLoginPassEntity
2019-08-22 11:21:16 +02:00
Regis Houssin
90f60b0137 FIX add $context parameter in checkLoginPassEntity 2019-08-22 10:56:07 +02:00
Laurent Destailleur
a19228ccc0 Fix compatibility with twofactor
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 10:53:42 +02:00
Laurent Destailleur
c7bec909b4 Fix compatibility with twofactor 2019-08-22 10:38:45 +02:00
Frans Bosman
e15d91640b
Update card.php 2019-08-22 09:43:04 +02:00
Laurent Destailleur
30266b00eb Trans 2019-08-22 01:25:25 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
ptibogxiv
f70180b51b
FIx number of col for IBAN list 2019-08-21 22:23:58 +02:00
Laurent Destailleur
f5aede8256 NEW GeoIP v2 support is natively provided. 2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e Code comment 2019-08-21 17:28:54 +02:00
ptibogxiv
074ea37664
Update stripe.class.php 2019-08-21 17:09:26 +02:00
ptibogxiv
e43d996780
Update 10.0.0-11.0.0.sql 2019-08-21 16:45:53 +02:00
ptibogxiv
869e497a48
NEW : Platforme compliance with Stripe Connect 2019-08-21 16:41:36 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
9bd229bc7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb Fix phpcs 2019-08-21 16:03:49 +02:00