2
0
forked from Wavyzz/dolibarr
Commit Graph

122 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
Laurent Destailleur
562348eb34 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
44c392ca23 Fix missing profid5 and 6 2015-02-24 13:35:37 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +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
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
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
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +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
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
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
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Laurent Destailleur
f47e80dca1 Fix: W3C 2011-08-31 14:55:54 +00:00