Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

197 Commits

Author SHA1 Message Date
Laurent Destailleur
248ac67af2 Fix php test 2016-06-05 02:24:31 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
a1c7632a50 Fix import mapping #5229 2016-06-04 01:28:51 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Laurent Destailleur
e1d35c2797 Fix waarnings 2016-04-12 19:29:32 +02:00
Laurent Destailleur
b60e90a7b7 NEW A module can add, into its import profiles, a sql request to execute 
at end of import. This allow to update dernormalized data after import.
 2016-04-11 18:08:03 +02:00
Laurent Destailleur
03f43d7c55 Removed a TODO by moving detection of line of records of a file to 
import into the import driver.
 2016-04-11 15:19:58 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Laurent Destailleur
81116da33b Add a control of file format 2016-02-22 15:10:33 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support 
NEW Allow imports from xlsx files
 2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
Laurent Destailleur
fcc26f36ba Fix default first line to import is 1 2016-02-20 02:45:31 +01:00
Laurent Destailleur
f762196c77 NEW Can define number of first and last line into import wizard. 2016-02-20 02:21:24 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
Laurent Destailleur
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00
Laurent Destailleur
12358c9721 FIX The import help was not visible on calculated fields 2015-11-23 12:20:43 +01:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
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
Laurent Destailleur
40404530ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-25 12:09:00 +01:00
Laurent Destailleur
e8addcb8ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +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
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
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