lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,043 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-3
Commit Graph

319 Commits

Author SHA1 Message Date
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
d51d063423
css 2019-11-02 17:34:27 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent 2019-10-27 09:51:15 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Laurent Destailleur
3f2ba2780f Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
Laurent Destailleur
4499447a89 Fix sort order of import profiles 
Fix picto in import profile for accounting
 2019-06-21 14:27:38 +02:00
ATM john
684879d73c apply appli btn to more elements 2019-04-16 21:49:26 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Philippe Grand
8de8657b82
Update index.php 
Too much copy and paste...
 2019-03-16 09:16:36 +01:00
Philippe GRAND
6536efa81c update with html5 compliant code 2019-03-15 09:41:56 +01:00
Laurent Destailleur
34c179ab2b Fix responsive 2019-03-04 10:42:09 +01:00
Laurent Destailleur
83fc10e917 css 2019-03-03 13:38:45 +01:00
Laurent Destailleur
cccad3416e Look and feel v10 2019-03-03 12:41:08 +01:00
Frédéric FRANCE
0022c4fe72
add visibility 2019-02-28 22:44:12 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
florian HENRY
95cc9faf7e fix php warning 2019-02-06 09:01:24 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Steve
70c0adc3d1 import.php 
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
 2018-12-20 16:49:17 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
76703972ed FIX #9355 2018-09-04 10:53:42 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Philippe GRAND
e9adc9fc8e Standardize code 2018-08-13 11:25:48 +02:00
Philippe GRAND
74704acbcb clean and update code 2018-07-18 16:13:13 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Philippe GRAND
da2f07c848 clean and update code 2018-06-21 15:01:45 +02:00
Frédéric FRANCE
622c394283
loadlangs 2018-05-26 21:11:25 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs 2018-05-26 15:41:32 +02:00
Laurent Destailleur
6a78ce65e9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/imports/import.php
 2018-02-25 12:21:10 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
bc1f741600 Fix duplicate instructions 2018-01-03 14:46:18 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
45fc5701ae NEW Add a profile to import product translations 2017-11-06 12:59:58 +01:00
Maxime Kohlhaas
e0e7e60048 Fix : GETPOST for update keys in import module 2017-10-03 11:28:13 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Maxime Kohlhaas
04ed2df827 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option 
# Conflicts:
#	htdocs/imports/import.php
 2016-12-11 16:20:46 +01:00
Laurent Destailleur
455a9ed4da FIX security in import of files 2016-12-07 12:41:48 +01:00
Laurent Destailleur
03f13e99de Fix regression. Icon was not icon of correct element. 2016-12-07 11:50:08 +01:00
bgenere
09baab1076 Fix display issue on step 4 of import in import.php. 
The issue was only for custom module import as the entity was
initialised with the icone name i.e. filename@modulename.

Then the arrays entitytoicon and entitytolang where used. But by
definition custom modules do not have entries in these arrays.

So changed the assignement to proper object property when $entity is not
in these 2 tables. This is not changing behaviour of default object.

I have tested both with my custom objet and product object. So it should
be fine now.
 2016-12-03 18:46:12 +01:00
bgenere
71434d84dd Fixed display issue on import step 4 screen when import_entities_array 
is empty. also fixed an extra -> displayed.
 2016-11-28 16:44:58 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Maxime Kohlhaas
f995768f24 Show import results 2016-10-02 19:17:22 +02:00
Maxime Kohlhaas
578cab9a70 Error management + show nb insert/update + langs 2016-10-02 19:14:28 +02:00
Maxime Kohlhaas
e6411dd246 Start work to allow updates in import module 2016-08-22 12:25:03 +02:00
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