Commit Graph

357 Commits

Author SHA1 Message Date
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
dc7db87ee5 Perf: Avoid makign a "desc table" for each row we import (for this we
are using a global cache array).
2014-03-19 20:23:29 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto
several lines.
2013-04-25 23:49:24 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Laurent Destailleur
7f15154c6b Qual: Uniformize skins code. 2013-04-03 15:45:06 +02:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Maxime Kohlhaas
fc4c5f333f Fix : fatal error while importing, function name wasn't complete 2012-11-17 10:19:26 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
2012-11-11 18:11:10 +01:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Christophe Battarel
99b323e8d0 fix wrong update in previous commit
(it was always remaining on step 5 !)
2012-10-08 16:25:50 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00
Laurent Destailleur
e0624abb2c Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when
using software a lot, it becomes annoying. So we let user choose
(choice possible only with eldy theme for the moment).
2012-09-09 14:49:20 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
0a88287b50 Fix: strict mode circus 2012-09-02 22:16:57 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Laurent Destailleur
492cf03989 Fix: Removed warning 2012-06-17 17:44:38 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view
wrapper.
2012-05-29 23:50:13 +02:00
Laurent Destailleur
c01fae04e4 Qual: Uniformize management of alt directories. 2012-05-08 22:49:03 +02:00
Laurent Destailleur
055689e2dc New: Import use generated codes if not provided into input file. 2012-03-04 13:00:53 +01:00
Laurent Destailleur
585f386ba3 Try a better fix 2012-03-03 19:09:29 +01:00
Regis Houssin
2de1ff11e2 Fix: uniformize code and remove htmlentities (bad character with utf8
files)
2012-03-03 18:41:06 +01:00
Laurent Destailleur
a3e3546eed Fix: Removed useless width 2012-01-18 01:37:17 +01:00
Laurent Destailleur
9215394965 New: Import wizard can import contacts.
New: A module can add import description for import wizard, even for
tables with foreign keys.
2012-01-18 00:16:02 +01:00
Laurent Destailleur
ed96de8f8b Fix: Sort files on name 2011-12-22 00:24:26 +01:00
Laurent Destailleur
a8ecfe2fb4 Look: Minor fix 2011-11-16 23:38:10 +01:00
Regis Houssin
f0c327c070 Fix: uniform code
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Laurent Destailleur
ca05f5350a Qual: Removed warnings 2011-09-20 21:21:04 +00:00
Laurent Destailleur
2057caa561 Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
59c9a9e87c Qual: Removed warnings 2011-09-20 21:21:04 +00:00
Laurent Destailleur
27a3e0d4e1 Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
ad157c52c4 Qual: Removed warnings 2011-09-20 21:21:04 +00:00
Laurent Destailleur
a81b8b522f Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
dff45b9c12 Qual: Removed warnings 2011-09-20 21:21:04 +00:00
Laurent Destailleur
18a0f18c08 Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
53d8bf2f17 Qual: Removed warnings 2011-09-20 21:29:13 +00:00
Laurent Destailleur
6cd38ecbb8 Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
e20038708c Qual: Removed warnings 2011-09-20 21:21:04 +00:00
Laurent Destailleur
70521b63ee Qual: More POO.
Qual: Doxygen
2011-09-20 17:34:15 +00:00
Laurent Destailleur
e11ca0f95a Qual: Reduce cyclomatic complexity 2011-09-20 21:07:29 +00:00
Laurent Destailleur
38cdb8961e Qual: Removed codesniffer errors 2011-09-20 15:48:06 +00:00
Laurent Destailleur
08b276b8fb Qual: Removed duplicate code 2011-09-20 15:29:31 +00:00
Laurent Destailleur
5799323ec8 Fix: UTF8 of import file names 2011-09-20 11:56:16 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
5fac7191cf Doxygen 2011-09-10 12:21:41 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Laurent Destailleur
f47e80dca1 Fix: W3C 2011-08-31 14:55:54 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
0adbca4625 Qual: Mutualize a lot of duplicate functions into functions.lib.php 2011-08-17 15:56:22 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
8e77de92d9 Fix: Bad line 2011-07-29 22:31:37 +00:00
Laurent Destailleur
03c7579beb Qual: Removed some deprecated/duplicated functions 2011-07-04 11:33:22 +00:00
Laurent Destailleur
72d6a714f5 doxygen 2011-07-04 08:53:01 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
de59722afa Doxygen 2011-02-05 18:42:34 +00:00
Laurent Destailleur
c57e3e3d13 Fix: Init at the wrong place 2011-02-02 19:34:44 +00:00
Laurent Destailleur
b5e5dc3849 Fix: Fix regression by adding "custom" feature making web server hang in infinite loop. 2010-12-15 18:15:08 +00:00
Laurent Destailleur
6846333ec8 New: Function dol_now('tzuser') is now supported. 2010-12-08 13:13:17 +00:00
Laurent Destailleur
2ab7e6c142 UTF8 2010-10-02 10:48:28 +00:00
Laurent Destailleur
7a2d72b6fd New: Can import members using assistant 2010-10-01 23:37:36 +00:00
Laurent Destailleur
a69b2a9437 New: Can import members with assistant 2010-09-30 19:25:58 +00:00
Laurent Destailleur
cf6680194e Removed scriptaculous drag and drop, replaced by jquery. 2010-08-24 22:18:50 +00:00
Laurent Destailleur
3f1275e190 Fix: doxygen 2010-07-21 23:45:08 +00:00
Laurent Destailleur
760a4d02b9 Qual: Normalize code 2010-07-21 17:39:17 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Philippe Grand
a981577553 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
8a9fe373d6 according to new tree directory 2010-05-03 08:43:32 +00:00
Laurent Destailleur
968addfad3 Fix: Better error management in upload files 2010-05-01 14:28:48 +00:00
Philippe Grand
757ddf44d6 according to new tree directory 2010-04-28 13:29:08 +00:00
Philippe Grand
b6bc9223df according to new tree directory 2010-04-28 10:33:16 +00:00
Regis Houssin
335c038dd8 Fix: regression 2010-04-21 22:14:11 +00:00
Regis Houssin
621bd68e3b Fix: workflow module is enabled by default
Fix: integration of triggers in the workflow module
!!! we now call "call_workflow" instead of "run_triggers" !!!
2010-04-21 16:29:37 +00:00
Laurent Destailleur
93076fa3f1 Fix: Removed deprecated function pdate() 2010-04-20 19:00:17 +00:00
Philippe Grand
011ea91f81 move interfaces class to core directory 2010-04-08 13:09:00 +00:00
Laurent Destailleur
0e9e2f6b21 Fix: Fix regression after removing pre.inc.php 2010-03-16 01:38:40 +00:00
Laurent Destailleur
de1d313148 Remove pre.inc.php on module directories. 2010-02-28 15:33:31 +00:00
Laurent Destailleur
99e6134e82 Qual: Clean a lot of code to prepare remove of pre.inc.php 2010-02-28 14:16:46 +00:00
Laurent Destailleur
8a37c13365 Look: Use style fieldrequired on mandatory fields 2010-02-04 19:54:58 +00:00
Laurent Destailleur
2800b7f709 Fix: Import must be possible with permission import 2010-01-21 22:19:16 +00:00
Laurent Destailleur
2f80ec6828 Fix: Import for companies works even with prefix empty. 2010-01-15 00:02:52 +00:00
Laurent Destailleur
5db8f59209 New: Add list of members in a member type card
New: Can make email for third party or users required
2010-01-08 17:33:30 +00:00
Laurent Destailleur
be1545b9db Explanation in import module is more clear. 2009-11-09 22:10:39 +00:00
Laurent Destailleur
2cd1bc975e Fix: Some minors fixes on import module and test to be sure we can enhance module to import when there is several tables. 2009-11-08 19:28:44 +00:00
Laurent Destailleur
b65e9f3c5a Fix: Menu entries 2009-11-04 20:58:56 +00:00
Laurent Destailleur
565cb6bc09 Cleaner informations 2009-10-28 18:46:00 +00:00
Regis Houssin
0ec8710582 Fix: field lost after selected country 2009-10-26 07:13:24 +00:00
Regis Houssin
37c2825f93 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-22 15:09:04 +00:00
Regis Houssin
d9dadd9671 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-21 13:09:42 +00:00
Laurent Destailleur
1312b0d8fd Try explode instead of split 2009-10-19 20:17:19 +00:00
Laurent Destailleur
c5702c5528 Work on import module 2009-10-17 13:48:17 +00:00
Laurent Destailleur
b8e871d97f Work on import module 2009-10-17 13:12:55 +00:00
Regis Houssin
902739d96a Fix: bad format in step 3 2009-10-16 07:11:13 +00:00
Laurent Destailleur
4875d5b969 Work on import module 2009-10-15 15:15:38 +00:00
Laurent Destailleur
1514c5a6fa Work on import module 2009-10-14 23:44:25 +00:00
Laurent Destailleur
0facaf4fc9 First change for future geoip module. 2009-10-13 21:46:09 +00:00
Laurent Destailleur
50553633e7 Work on import module 2009-10-13 17:23:26 +00:00
Laurent Destailleur
eb4d353f11 Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them. 2009-10-04 18:01:30 +00:00
Laurent Destailleur
f68be991ff Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them. 2009-10-04 17:18:09 +00:00
Laurent Destailleur
e682f3f83b Work on import module 2009-10-03 22:32:10 +00:00
Laurent Destailleur
cf6b052006 Work on import module 2009-10-03 14:16:52 +00:00
Laurent Destailleur
d9ecd2347a Work on import module 2009-10-03 12:08:48 +00:00
Regis Houssin
a34c450953 Fix: bug during backup import model 2009-10-03 06:36:13 +00:00
Laurent Destailleur
1addc14aa9 Work on import module 2009-10-02 23:07:31 +00:00
Laurent Destailleur
ecd690e4d1 Work on import module 2009-10-01 22:17:18 +00:00
Laurent Destailleur
492f26f04b Work on import module 2009-10-01 21:31:55 +00:00
Laurent Destailleur
8d8325fe95 Work on import module 2009-10-01 11:48:20 +00:00
Laurent Destailleur
c482fa38ad Work on import module 2009-09-30 16:02:54 +00:00
Laurent Destailleur
80d4b9b26c Work on import module 2009-09-28 20:06:15 +00:00
Laurent Destailleur
f0e9746de8 Work on import module 2009-09-14 22:36:36 +00:00
Laurent Destailleur
452a88c606 Work on import module 2009-09-14 21:35:42 +00:00
Laurent Destailleur
8bf7dc39af Work on import module 2009-09-14 21:27:09 +00:00
Laurent Destailleur
caf52993ec Work on import module 2009-09-12 02:07:25 +00:00
Laurent Destailleur
87824d4040 Work on import module 2009-09-12 02:07:25 +00:00
Laurent Destailleur
53b6d89edd Work on import module 2009-09-07 23:49:16 +00:00
Laurent Destailleur
4483a7e261 Work on import module 2009-09-07 21:14:21 +00:00
Laurent Destailleur
b0e3b124e0 Work on import module 2009-09-02 23:46:55 +00:00
Laurent Destailleur
8b7ca67ba3 Work on import module 2009-08-30 21:56:03 +00:00
Laurent Destailleur
c8aceb1c7b Work on import module 2009-08-23 00:34:55 +00:00
Laurent Destailleur
d06f00da5e Work on import module 2009-08-23 00:24:56 +00:00
Laurent Destailleur
d2e3e207a6 Work on import module 2009-08-23 00:15:30 +00:00
Laurent Destailleur
c11cef6d47 Add help link to online wiki 2009-08-12 12:59:14 +00:00
Laurent Destailleur
99985ad417 Work on import module 2009-07-29 19:47:15 +00:00
Laurent Destailleur
127ab8911d Work on import 2009-06-18 21:56:46 +00:00
Laurent Destailleur
8732364f01 Qual: Now module services and products are two completely separated modules. 2009-06-08 18:14:37 +00:00
Laurent Destailleur
924f541e61 Work on import module 2009-06-07 18:08:41 +00:00
Laurent Destailleur
a687f859d5 Work on import module 2009-05-21 23:45:20 +00:00
Regis Houssin
77dd754fc3 Fix: some errors 2009-05-20 11:33:44 +00:00
Laurent Destailleur
c13477f860 Work on import module 2009-05-20 11:09:56 +00:00
Laurent Destailleur
75471b89ee Work on import module 2009-05-19 18:11:47 +00:00
Regis Houssin
dcb54f5321 Fix: lien invalide
Fix: requete invalide ou obsolete
Add: dbut ajout possibilit de dfinir un style css aux mailings (background-image,
 etc...)
2009-05-19 02:43:03 +00:00
Laurent Destailleur
a588260818 Work on import module 2009-05-19 00:33:57 +00:00
Laurent Destailleur
8b12e7c07b Work on import module 2009-05-19 00:14:27 +00:00
Regis Houssin
e5d222b6cc Fix: rgression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car
comportement alatoire avec certaines fonctions
2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplmentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
35072b99bf Fix: ajout d'un jeton alatoire dans les requetes POST 2009-05-15 14:56:03 +00:00
Laurent Destailleur
c85b9cb017 Add first files for import module 2009-03-25 21:26:15 +00:00