Commit Graph

77553 Commits

Author SHA1 Message Date
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209
FIX display payment intent in stripe's charge list
2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210
FIX display only stripe sources for customer
2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9
Update admin.lang
2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11
Update price_parser.class.php
2019-08-10 01:11:02 +02:00
Laurent Destailleur
2a726441a0
Merge pull request #11635 from frederic34/patch-10
FIX Return code of pdf_einstein.modules.php and proformat
2019-08-10 01:09:48 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
f752b96a7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 00:14:27 +02:00
Abbes Bahfir
8f2786cf7b fix:this is not accessible in static context 2019-08-10 00:09:36 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Laurent Destailleur
0efcd590e2
Merge pull request #11668 from hregis/10.0_mc
FIX better help message with multicompany
2019-08-09 23:46:42 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Ferran Marcet
cda8b15c7f FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field 2019-08-05 14:00:15 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00
atm-greg
41c07b9b43 fix bad test in delivery card 2019-08-05 13:10:26 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang
found in admin/company.php
2019-08-05 11:01:58 +02:00
Laurent Destailleur
0ede654482 Prepare 10.0.1 2019-08-04 13:15:49 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
ptibogxiv
4633af3f5d
Update charge.php 2019-08-03 21:19:47 +02:00
ptibogxiv
4ed1ff5b9b
Fix display only stripe sources for customer 2019-08-03 21:17:12 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:57 +02:00
Laurent Destailleur
f210e286bd Fix balance of div 2019-08-03 20:53:28 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:18 +02:00
ptibogxiv
07cc21a113
Fix display payment intent in stripe's charge list 2019-08-03 20:35:53 +02:00
Laurent Destailleur
b40f2cbcce Fix responsive 2019-08-03 20:20:09 +02:00
Laurent Destailleur
83412e3c90 Fix warning 2019-08-03 16:38:57 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
ptibogxiv
d30ce126e0
Fix update stripe api for more compliance to API 2019-08-03 13:00:52 +02:00
ptibogxiv
13eef54392
Fix round for application fee in stripe 2019-08-03 12:31:13 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
76b7aa2e0f Fix fields with visible = 3 must not be visible into list 2019-08-02 19:20:19 +02:00
Laurent Destailleur
55e8aca47e Fix skeleton of module 2019-08-02 19:06:40 +02:00
ptibogxiv
2d34a0c4c1
Fix table in admin stripe.php 2019-08-02 14:48:45 +02:00
ptibogxiv
3a0c1954d6
Fix application_fee_amount
need fix in v10 too
2019-08-02 13:23:15 +02:00
ptibogxiv
74e3a423fd
Fix document list for products in API 2019-08-02 12:35:00 +02:00
Juanjo Menent
03a2377abc Fix: allow access from any other class that inherits Form class. 2019-08-02 12:31:24 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00