lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5017 from simnandez/develop

Browse Source 
FIX Travis fails
This commit is contained in:
Juanjo Menent 2016-04-16 09:34:46 +02:00
commit 7163ee55f7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/import/import_csv.modules.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr> * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012-2016 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -171,6 +171,7 @@ class ImportCsv extends ModeleImports
/** /**
* Return nb of records. File must be closed. * Return nb of records. File must be closed.
* *
* @param string $file Path of filename
* @return int <0 if KO, >=0 if OK * @return int <0 if KO, >=0 if OK
*/ */
function import_get_nb_of_lines($file) function import_get_nb_of_lines($file)

5
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr> * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012-2016 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -214,7 +214,8 @@ class Importxlsx extends ModeleImports
/** /**
* Return nb of records. File must be closed. * Return nb of records. File must be closed.
* *
* @param string $file Path of filename
* @return int <0 if KO, >=0 if OK * @return int <0 if KO, >=0 if OK
*/ */
function import_get_nb_of_lines($file) function import_get_nb_of_lines($file)

1
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
View File

@ -382,3 +382,4 @@ ALTER TABLE llx_product_fournisseur_price ADD supplier_reputation varchar(10) NU
-- Delete old deprecated field -- Delete old deprecated field
ALTER TABLE llx_product_stock DROP COLUMN pmp; ALTER TABLE llx_product_stock DROP COLUMN pmp;
ALTER TABLE llx_societe ADD COLUMN fk_shipping_method_id integer;

3
htdocs/install/mysql/tables/llx_societe.sql
View File

@ -103,5 +103,6 @@ create table llx_societe
webservices_key varchar(128), -- supplier webservice key webservices_key varchar(128), -- supplier webservice key
fk_multicurrency integer, fk_multicurrency integer,
multicurrency_code varchar(255) multicurrency_code varchar(255),
fk_shipping_method_id integer
)ENGINE=innodb; )ENGINE=innodb;