From c8aceb1c7b2f93ed4f90afe292a4b70cfca82c12 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Aug 2009 00:34:55 +0000 Subject: [PATCH] Work on import module --- htdocs/imports/import.php | 8 ++++---- htdocs/langs/en_US/exports.lang | 2 +- htdocs/langs/fr_FR/exports.lang | 2 +- htdocs/theme/common/helpdoc.png | Bin 780 -> 693 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 5eba016e0b1..5789e6c6c0f 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -653,8 +653,8 @@ if ($step == 3 && $datatoimport) $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity; $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity; - print ''.img_object('',$entityicon).' '.$langs->trans($entitylang).''; - print ''.$langs->trans($label).' ('.$code.')'; + print ''.img_object('',$entityicon).' '.$langs->trans($entitylang).''; + print ''.$langs->trans($label).' ('.$code.')'; print ''; $save_select.=$bit; @@ -968,11 +968,11 @@ function show_elem($fieldssource,$pos,$var,$key) else { //print ''.img_file('','').''; - print ''; + print ''; // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object print img_picto($langs->trans("MoveBox",$pos),'uparrow','class="boxhandle" style="cursor:move;"'); print ''; - print ''; + print ''; print $langs->trans("Field").' '.$key.': '; print $fieldssource[$key]['name'].' ('.$fieldssource[$key]['example1'].')'; print ''; diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 15e69592f66..ec326bc9498 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -58,6 +58,6 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) FileWithDataToImport=File with data to import FileToImport=Source file to import FileMustHaveOneOfFollowingFormat=File to import must have one of following format -ChooseFileToImport=Choose file to import then click on picto %s ... +ChooseFileToImport=Upload or choose file to import then click on picto %s ... FieldsInSourceFile=Fields in source file FieldsInTargetDatabase=Target fields in Dolibarr database diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index a52805fe7da..cc6abd9e0de 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -58,6 +58,6 @@ TypeOfLineServiceOrProduct=Type de ligne (0=produit, 1=service) FileWithDataToImport=Fichier contenant les données à importer FileToImport=Fichier source à importer FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir un des formats suivants -ChooseFileToImport=Choisissez le fichier à importer puis cliquez sur le picto %s ... +ChooseFileToImport=Ajouter ou choisissez le fichier à importer puis cliquez sur le picto %s ... FieldsInSourceFile=Champs dans le fichier source FieldsInTargetDatabase=Champs cibles dans la base Dolibarr \ No newline at end of file diff --git a/htdocs/theme/common/helpdoc.png b/htdocs/theme/common/helpdoc.png index 8aeaea107b99fb5660d6e4913a437f09b4496454..8cd950e7be1aabd9b452c150ddd128e6223f72e1 100644 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3-n?Kj!QJQtTz3zOL*yIm8(h1*R4sQwIuh z7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(gFvFbW3vgt#WhMCT+Y<)x(*q^A{T zq!(wTmtW@nYe1b)pXa_PHJtQ(%w3?qit$u`?Ri(ncbbUdwb^e_0F5nw|MI0)pKU8nKygW z;ssllEZVwc(Y9racPwAJW5u$aE0^tBxqSD^<$G4G*t2@&-Zd-tty#5i?dtvO)*Rlr z{>Y~FN4IP|wr$Jt?ORXo*mi2yj?=q$p5C+T%--GS5AHvI=)i@;2QM5sboJ!%tEWy} zKXdBl`LlN}UATMs(u3>Q9^Sn1=+@20w{JbUd;96VyHD@md-3Sui^q>%J$dr_>C+Fd zUw?Z4?(>KDUp{{L{_W$>@85s_{8_O+r3V;T(Ir8C!T)In80P%iu?J|)0Z$jl5RU7< z{l|rx92lIhx4M>XOnBe4_xrj8ap`RvdH?)xf6>tQY|@$CDvY~U8m*eeI3ujYSz1p6?#fDol7fyyMQn;~@~bO(*jkIbo15g5+^oDJ*!SLv-94?NHTAgq&26>YkF*?h z-hD;pQ=P-MV|}4EcJ*1?o$qh^rx$wU$|uW5X7%wRialj+Rg5pQ^%CbiI4TMB3xlVt KpUXO@geCx!B8$ub delta 767 zcmVeSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00OQ_L_t(|+KiK3NRv?<#-DxI`_66YhGc5F`2mJtMIza9en9G6Q>qD- zUFevYdQk{LAVhTGMHgL17tuw87e!d+94cGWoSXFKTsat--+#`zsZ*zIQ}?cS3xY(c zb9D~q|2*e+p7TGfz|RdFHU_(Un)-~UXNt1Yx}s`j=Rq~B!wgLCJ~WSx*$P+Ief8uK z;whWOLPbfj;exXA%|8t+`u=(gMHP8g*BY~>67Wb8->0S#2!)>W2qIWfT4E?vl)pXD zV7N!$X!$ZGTYukJ*IbgzAruM_p=pG6c0k#`V%g)xE**Z6z!&)2J09KT?iW*b`}tL$ zPm?4TV{&E&i%V|s`FvbfR6?96LLd;trr)n|dA*%Z$|nCqFx0JU8h1GISJ!+^d*MB> zSZqj6q~T0%E(9VG=4WR>+3eV5_UJH;EU6TVni|9i%zrw4qitd$-?i*%imo|KU;+UT zIhmPod%bXc8b&Y_!geqK4x58I^)(!qX25Q>fNLKdR-4S0vOPLn7Zrvh5yZvC#gJ#` zW?}hE{Z5A=_%+9M&jY)4mp>O-ieMNUMR#xr3!h4GEhS%n9L*aZ*L=> z$7941+)%5L!iZfzCefwqH8i)j-iwiW78WvIzk2zE%Vvj*ii>O0b57w1LBhA<#kUbN z1}#=pE30DIi;VbvuikXKrKK%dk~a2NAIvzM3V5TzppDLDGFfeQ-f0jd58IoY*xFpj zoYRS({sDtV)9@fIJHvcvC(b!1%Lfg{29hKK=L!n65{AgZq}`>{nY7x*`>9zH>wo=) xsL{uPfxc)5&dx93PFvgAV<%I__t*UrU;wr5KrO2iTqpnl002ovPDHLkV1iGKYD544