Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop
Dolibarr · Nov 11, 2018 · 4f7d3e7 · 4f7d3e7
2 parents f022be3 + 65d8f59
commit 4f7d3e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -55,7 +55,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN desc_fourn text after ref_f
 ALTER TABLE llx_user ADD COLUMN dateemploymentend date after dateemployment;
 
 ALTER TABLE llx_stock_mouvement ADD COLUMN fk_project integer;
-
+Alter tABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(32)
 ALTER TABLE llx_c_field_list ADD COLUMN visible tinyint	DEFAULT 1 NOT NULL AFTER search;
 
 

diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
@@ -55,4 +55,4 @@
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion("2018-09-24"); // force version API
+\Stripe\Stripe::setApiVersion("2018-11-08"); // force version API