Commit Graph

67255 Commits

Author SHA1 Message Date
Regis Houssin
bf4402eb89 Fix: missing superadmin 2018-03-06 19:22:59 +01:00
Regis Houssin
175971bfc1 Fix: syntax error 2018-03-06 19:12:18 +01:00
Regis Houssin
d406b28911 Fix: problem to see users with transverse mode 2018-03-06 19:08:39 +01:00
ptibogxiv
382fe4f13c
FIX group account settings
transfert bank settinds to account setting et let only general common online payment settings
2018-03-06 16:29:43 +01:00
ptibogxiv
613e92e5e8
update stripe php 2018-03-06 13:52:56 +01:00
ptibogxiv
f35606e434
FIX update stripe php librairy 2018-03-06 13:50:42 +01:00
Regis Houssin
1807bb36e2 Fix: missing global $conf 2018-03-06 13:31:13 +01:00
ptibogxiv
10b16187d4
NEW convert rib.php to gateway.php 2018-03-06 13:26:40 +01:00
ptibogxiv
5e0327329c
NEW convert rib.php to gateways.php
do stripe integration 
be conform to PSD2 rules
less tab fo company
2018-03-06 13:23:35 +01:00
Regis Houssin
35703cff99 Fix: wrong entity id, already value 1 ! 2018-03-06 13:23:00 +01:00
ptibogxiv
c133b04abf
ADD banktransfer account for stripe webhook 2018-03-06 13:16:12 +01:00
Laurent Destailleur
592a97f9a5 Fix default topic 2018-03-06 12:45:48 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
Laurent Destailleur
7c95233e3c FIX Trad and creation date in subscription create 2018-03-06 09:08:28 +01:00
Laurent Destailleur
14d7ffa53b Fix cancel and template to record stock movement/correction 2018-03-06 09:07:39 +01:00
Laurent Destailleur
6d13e58a23 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-06 09:07:03 +01:00
Laurent Destailleur
a765dba570 Fix trad 2018-03-06 09:06:49 +01:00
Alexandre SPANGARO
4a46ffc5d8 Add information in VAT admin page 2018-03-06 05:02:09 +01:00
Laurent Destailleur
0cfa19ee09 NEW Online payment of invoice and subscription record the payment
automatically.
2018-03-06 00:12:23 +01:00
Laurent Destailleur
d569adea2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-05 21:46:40 +01:00
Laurent Destailleur
2f9f4d0675 WIP Create payment of member subscription with paypal 2018-03-05 21:46:24 +01:00
ptibogxiv
10ff23e6c4
Update charge 2018-03-05 21:35:37 +01:00
ptibogxiv
b09e6f3279
Update transaction.php 2018-03-05 21:35:00 +01:00
Laurent Destailleur
1537363e59 Fix cancel and template to record stock movement/correction 2018-03-05 21:16:01 +01:00
Laurent Destailleur
5774087544
Merge pull request #8280 from atm-alexis/NEW_price_on_stock_mvt
NEW Can see Unit Purchase Value of product in stock movement
2018-03-05 20:59:07 +01:00
Laurent Destailleur
c921fde3e5
Update mouvement.php 2018-03-05 20:58:30 +01:00
Laurent Destailleur
f9f37c52de
Merge pull request #8275 from ATM-Nicolas/fix_order_line_fk_multicurrency
Fix order line fk multicurrency
2018-03-05 20:50:14 +01:00
Laurent Destailleur
a87d558b41
Merge pull request #8274 from defrance/patch-104
Optimise SQL squery
2018-03-05 20:50:00 +01:00
Laurent Destailleur
5de43d6652
Merge pull request #8273 from fappels/7.0_fix_insert_expedition_line
Fix shipment line insert
2018-03-05 20:47:03 +01:00
Laurent Destailleur
81e193b725
Update expedition.class.php 2018-03-05 20:46:54 +01:00
Laurent Destailleur
951babae6d
Merge pull request #8272 from aspangaro/7.0
Fix : Missing language file
2018-03-05 20:44:34 +01:00
Laurent Destailleur
65fe376bbf
Merge pull request #8270 from hregis/7.0_bug4
Fix: avoid Warning: A non-numeric value encountered
2018-03-05 20:44:23 +01:00
Laurent Destailleur
45898d26a8
Merge pull request #8267 from hregis/7.0_bug5
Fix: check if file name already exists
2018-03-05 20:44:02 +01:00
ptibogxiv
ac05dbb206
Update charge 2018-03-05 20:07:00 +01:00
ptibogxiv
76e81eec90
Update transaction.php 2018-03-05 20:06:14 +01:00
ptibogxiv
877b446373
NEW add stripe transaction 2018-03-05 20:01:55 +01:00
ptibogxiv
dacd49e789
Update charge 2018-03-05 20:01:07 +01:00
ptibogxiv
01bb263fd7
Create charge 2018-03-05 19:58:50 +01:00
ptibogxiv
afa8b37239
NEW: add link to stripe's info in bank menu 2018-03-05 19:45:55 +01:00
Alexis ALGOUD
35002cf93d
Merge branch 'develop' into NEW_price_on_stock_mvt 2018-03-05 17:45:27 +01:00
Laurent Destailleur
667db35e75 Better form for subscription 2018-03-05 17:44:38 +01:00
Alexis Algoud
a84990ab78 NEW price in burger menu on mouvement list 2018-03-05 17:43:06 +01:00
ptibogxiv
136b5c4431
New introduce stripeconnect mode 2018-03-05 17:26:03 +01:00
ptibogxiv
fcf7d8f162
NEW introduce stripeconnect mode 2018-03-05 17:23:32 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
Laurent Destailleur
db65379ebc FIX Subscription not correctly log in blockedlog 2018-03-05 17:07:59 +01:00