From 24d3fdfe6c32cf89d21acfb860c0a83ea45aa501 Mon Sep 17 00:00:00 2001 From: eldy Date: Sun, 6 Jan 2013 21:52:59 +0100 Subject: [PATCH 1/7] Fix: bad setup entry page --- htdocs/install/etape5.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 79a035257fa..e73239acb9d 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -338,7 +338,7 @@ if ($action == "set") print $langs->trans("YouNeedToPersonalizeSetup")."

"; - print '
'; + print '
'; print $langs->trans("GoToSetupArea"); print '
'; } From 091e46905047b972b6e3042df314076976a2f7eb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Jan 2013 00:40:18 +0100 Subject: [PATCH 2/7] Fix: [ bug #622 ] attaching wrong file when sending the invoice via e-mail --- htdocs/comm/propal.php | 4 +-- htdocs/commande/fiche.php | 52 ++++++++++++++++----------------- htdocs/compta/facture.php | 6 ++-- htdocs/core/lib/files.lib.php | 4 +-- htdocs/expedition/fiche.php | 4 +-- htdocs/fichinter/fiche.php | 4 +-- htdocs/fourn/commande/fiche.php | 8 ++--- htdocs/fourn/facture/fiche.php | 4 +-- htdocs/theme/eldy/style.css.php | 5 +++- 9 files changed, 47 insertions(+), 44 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index f6316a44975..a8c268ccfee 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1817,7 +1817,7 @@ if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -1840,7 +1840,7 @@ if ($action == 'presend') dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 8acf2ae85af..167f4c53268 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -204,14 +204,14 @@ else if ($action == 'add' && $user->rights->commande->creer) $action='create'; $error++; } - + if (! $error) { $object->socid=$socid; $object->fetch_thirdparty(); - + $db->begin(); - + $object->date_commande = $datecommande; $object->note = GETPOST('note'); $object->note_public = GETPOST('note_public'); @@ -226,7 +226,7 @@ else if ($action == 'add' && $user->rights->commande->creer) $object->date_livraison = $datelivraison; $object->fk_delivery_address = GETPOST('fk_address'); $object->contactid = GETPOST('contactidp'); - + // If creation from another object of another module (Example: origin=propal, originid=1) if (! empty($origin) && ! empty($originid)) { @@ -237,7 +237,7 @@ else if ($action == 'add' && $user->rights->commande->creer) $element = $regs[1]; $subelement = $regs[2]; } - + // For compatibility if ($element == 'order') { $element = $subelement = 'commande'; @@ -248,10 +248,10 @@ else if ($action == 'add' && $user->rights->commande->creer) if ($element == 'contract') { $element = $subelement = 'contrat'; } - + $object->origin = $origin; $object->origin_id = $originid; - + // Possibility to add external linked objects with hooks $object->linked_objects[$object->origin] = $object->origin_id; $other_linked_objects=GETPOST('other_linked_objects','array'); @@ -259,32 +259,32 @@ else if ($action == 'add' && $user->rights->commande->creer) { $object->linked_objects = array_merge($object->linked_objects, $other_linked_objects); } - + $object_id = $object->create($user); - + if ($object_id > 0) { dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); - + $classname = ucfirst($subelement); $srcobject = new $classname($db); - + dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines"); $result=$srcobject->fetch($object->origin_id); if ($result > 0) { $lines = $srcobject->lines; if (empty($lines) && method_exists($srcobject,'fetch_lines')) $lines = $srcobject->fetch_lines(); - + $fk_parent_line=0; $num=count($lines); - + for ($i=0;$i<$num;$i++) { $label=(! empty($lines[$i]->label)?$lines[$i]->label:''); $desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle); $product_type=(! empty($lines[$i]->product_type)?$lines[$i]->product_type:0); - + // Dates // TODO mutualiser $date_start=$lines[$i]->date_debut_prevue; @@ -293,12 +293,12 @@ else if ($action == 'add' && $user->rights->commande->creer) $date_end=$lines[$i]->date_fin_prevue; if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel; if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end; - + // Reset fk_parent_line for no child products and special product if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) { $fk_parent_line = 0; } - + $result = $object->addline( $object_id, $desc, @@ -323,19 +323,19 @@ else if ($action == 'add' && $user->rights->commande->creer) $lines[$i]->pa_ht, $label ); - + if ($result < 0) { $error++; break; } - + // Defined the new fk_parent_line if ($result > 0 && $lines[$i]->product_type == 9) { $fk_parent_line = $result; } } - + // Hooks $parameters=array('objFrom'=>$srcobject); $reshook=$hookmanager->executeHooks('createFrom',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -356,7 +356,7 @@ else if ($action == 'add' && $user->rights->commande->creer) else { $object_id = $object->create($user); - + // If some invoice's lines already known $NBLINES=8; for ($i = 1 ; $i <= $NBLINES ; $i++) @@ -370,7 +370,7 @@ else if ($action == 'add' && $user->rights->commande->creer) } } } - + // Insert default contacts if defined if ($object_id > 0) { @@ -383,11 +383,11 @@ else if ($action == 'add' && $user->rights->commande->creer) $error++; } } - + $id = $object_id; $action = ''; } - + // End of object creation, we show it if ($object_id > 0 && ! $error) { @@ -1405,7 +1405,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; $datedelivery = (!empty($objectsrc->date_livraison)?$objectsrc->date_livraison:''); - + $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : '')); $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : ''); @@ -2347,7 +2347,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -2370,7 +2370,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 815ead2cf09..bd1e21157de 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2689,7 +2689,7 @@ else if ($id > 0 || ! empty($ref)) { $num = $db->num_rows($result); $i = 0; - + //if ($object->type != 2) //{ if ($num > 0) @@ -3343,7 +3343,7 @@ else if ($id > 0 || ! empty($ref)) $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -3366,7 +3366,7 @@ else if ($id > 0 || ! empty($ref)) dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 3285301750f..73cece06e22 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -140,7 +140,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file); - if (! $filter || preg_match('/'.$filter.'/i',$path.'/'.$file)) + if (! $filter || preg_match('/'.$filter.'/i',$file)) // We do not search key $filter into $path, only into $file { $file_list[] = array( "name" => $file, @@ -164,7 +164,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file); - if (! $filter || preg_match('/'.$filter.'/i',$path.'/'.$file)) + if (! $filter || preg_match('/'.$filter.'/i',$file)) // We do not search key $filter into $path, only into $file { $file_list[] = array( "name" => $file, diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 8a9685669d0..8992048f14b 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1407,7 +1407,7 @@ else { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref); + $fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -1430,7 +1430,7 @@ else dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref); + $fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 6694a20684c..1f27c594908 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -1451,7 +1451,7 @@ else if ($id > 0 || ! empty($ref)) { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -1474,7 +1474,7 @@ else if ($id > 0 || ! empty($ref)) dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index c055642803d..348f296ff89 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1071,7 +1071,7 @@ if (! empty($object->id)) if($mysoc->localtax1_assuj=="1") $nbrow++; if($object->thirdparty->localtax2_assuj=="1") $nbrow++; } - else + else { if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++; @@ -1245,7 +1245,7 @@ if (! empty($object->id)) print ''.$langs->trans("Currency".$conf->currency).''; } } - else + else { if ($mysoc->localtax1_assuj=="1") //Localtax1 { @@ -1783,7 +1783,7 @@ if (! empty($object->id)) { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -1806,7 +1806,7 @@ if (! empty($object->id)) dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref); + $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 8e6b66e71bd..f15dcd67114 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -2036,7 +2036,7 @@ else { $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref); + $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; // Build document if it not exists @@ -2059,7 +2059,7 @@ else dol_print_error($db,$result); exit; } - $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref); + $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($object->ref,'/')); $file=$fileparams['fullname']; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1e9f9a67e7f..aa3e808366b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -239,7 +239,10 @@ input:-webkit-autofill { input.liste_titre { box-shadow: none !important; } - +input.removedfile { + padding: 0px !important; + border: 0px !important; +} textarea:disabled { background:#ddd; } From 0e21a61eca4d4821683dedb60e37036e514ba1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 7 Jan 2013 01:26:33 +0100 Subject: [PATCH 3/7] Updated change log --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96f459b4f64..d4d90a73359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,14 +76,14 @@ New experimental modules: - Fix: [ bug #499 ] Supplier order input method not translated -- Fix: No images into product description lines as PDF generation does - not work with this. +- Fix: No images into product description lines as PDF generation does not work with this. - Fix: Errors weren't being shown in customer's & supplier's orders - Fix: Lastname wasn't being recorded in xinputuser emailing module. - Fix: [ bug #653 ] Error while creating agenda additional attributes - Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO - Fix: [ bug #658 ] Search on bank do not work for description - Fix: [ bug #659 ] Comment in recurrent invoices is not stored +- Fix: [ bug #622 ] Attaching wrong file when sending the invoice via e-mail For developers: - New: Add webservice for thirdparty creation and list. From eca1e3a7e194ae1bb356c38b1e483ee9288bfb3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Jan 2013 17:57:39 +0100 Subject: [PATCH 4/7] Look: Minor fix in themes --- htdocs/.gitignore | 1 + htdocs/core/class/html.formfile.class.php | 2 +- htdocs/theme/amarok/graph-color.php | 10 ++--- htdocs/theme/amarok/img/vmenu.png | Bin 914 -> 923 bytes htdocs/theme/amarok/style.css.php | 42 +++++++++------------ htdocs/theme/eldy/style.css.php | 43 +++++++++++----------- 6 files changed, 46 insertions(+), 52 deletions(-) diff --git a/htdocs/.gitignore b/htdocs/.gitignore index dfa990ed38c..8c416b1e28c 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -2,3 +2,4 @@ /custom* /bootstrap /multicompany +/skincoloreditor diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index d541808ae36..15ea8b2cc2c 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -378,7 +378,7 @@ class FormFile $out.= ''; $out.= '
'.$titletoshow.'
'; - $out.= ''; + $out.= '
'; $out.= ''; diff --git a/htdocs/theme/amarok/graph-color.php b/htdocs/theme/amarok/graph-color.php index f0a27c30243..12662b3bdc6 100755 --- a/htdocs/theme/amarok/graph-color.php +++ b/htdocs/theme/amarok/graph-color.php @@ -22,10 +22,10 @@ * \ingroup core */ -global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; -$theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(101,191,112), array(164,206,230), array(248,128,128), array(252,245,184), array(190,190,190)); -$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); -$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); +global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; +$theme_bordercolor = array(235,235,224); +$theme_datacolor = array(array(125,135,150), array(200,160,180), array(190,190,220), array(170,140,190), array(190,190,170)); +$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); +$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); ?> diff --git a/htdocs/theme/amarok/img/vmenu.png b/htdocs/theme/amarok/img/vmenu.png index 386261c83ae08ac563886ac291433ebdb8b9e423..74d696bf6b227ee93b616258f5ba111fd84d3309 100755 GIT binary patch delta 900 zcmV-~1AF|E2b%|wB!2{HLqkwWLqi}?a&Km7Y-Iodc-oDV%WoT16vlsJkEfLqvB9*( zs?ZgSHbO}>eW*=@Xluu=l{Oe_niMBOswU%Wd&tdrdS{$I)CKB>9W97G;vrW20Tt?k zT~{cTs)CRz)>H^osi+%N%)*bEmOweHbHDSQ?|k=MUC4dvhJT^T2-pl_?Nm#mvAQO9 z{X~XWnV`Ug>qTL)US9%m!%*>$c=7`Vz`dEB>;D-OO&NJ$>;}5c$lCC-E~6c~l8o#l6dJz$jl zcyW1%H-h!rI|IJ)!AAG2Gvs{Tl;sLA4aV(g>s)2Tx!PH%4LQHO@1Cgx1u*^!PR##d=vtQDkTI}Bmoc6_;_@wqv?)WZ61!R7wI7pIGm?+v(TGLRIcj_zPEkj z(KFrM)RZ=o06CsgO`Rh)#>^SQMB&c0+xrrY`{u3p?oHmgMiGUgjbsyvPk|g(7NA2f!R7}m61UtHyC{|HphdZ-; z6h12i_*_DwiEvQ_TtTFFG3qv7GY^@I=A1c?Fi)DN%oAqWoHO4vmqrY$VwJ5T!g|A+ zw+>lntYUH#>!4M(=BHC7 z`|VCF4%_x|Q4B*R#bV&iP77Blq5XCzj)azx)LXJSOJj9S48G%I2LmwnY$sU!HoWya zWbY=}S`WU7VDHfcn<~I7pTVtTUQcfg|F>a$4^ivL;lXLL1i7F4{l^Dj*C+7w<9`3o zFMay`r(Z($0eq+a2B{+o*2Yf+eE1BCpW2a*SnB!3=hLqkwWLqi}?a&Km7Y-Iodcmah}-)qxQ6#m*}ov`7HI%g3H zK4_6{WK(oQoVIIMy3JbZHn$;2o2G4Cn#LsUey|7Gi*Gu`cku^4`3DTygKvA14aO8< z_^gN`O!gwPo|`mHCsPBt_q*Tu?l~vtd#()tZ$I5%3%!zLYh@BH>w}XODA7?mkV}ap}jU$$3G&Mk)3Bm`(LOM&hKscCb;PVaG&VdxT{kd6Mw!v>uJs^jnfT zR@>X;&88#6#CK6Y14u%GjvQnt;E_TMVVYyas`yM686rxg(rI*5d9paxJ1CQu?HosV z$zKk*UKaIRvbgr(`<~q;*N(gug~hj{*ir4Zf$6%k6Pg=;bz!BWZs9k%<(nIAs|yHG z{)*+XNPk{s%1?q(*L61LkW-iZbqmijlRkTFAAoxUVZoQgT}+E5E826uw%=Hgs0*9V@v z%w6I7xd^Q;awCqy7xhJaA@II4zCK^KZ-`;1+kd{(Wb30bTI;*hk-DO>dX$gbC-yy# zsuLNqvA(f>RtPJ!qGM`Gvvf}Y10`)vm-7Xa?-7Ixe2A_siI1ydSCCID3U8SVUY86> zuSnT0use_K1GZDvUFK3M8di%+LhEXsY0)spRwrpI-005Ij1*niq RSXTf5002ovPDHLkV1nDvsL22T diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 23b030249ca..3202f868356 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -303,23 +303,6 @@ td.showDragHandle {cursor:move;} .tdlineupdown {white-space:nowrap;} -/* ============================================================================== */ -/* Styles de positionnement des zones */ -/* ============================================================================== */ - -td.vmenu { - - margin-right:2px; - padding:0px; - width:170px; - -} - -div.fiche { - padding:8px 12px 10px; -} - - /* ============================================================================== */ /* Menu top et 1ère ligne tableau */ /* ============================================================================== */ @@ -424,7 +407,6 @@ div.vmenu { display:none; width:170px; - background-color:#dde2e9; } @@ -632,8 +614,18 @@ a.tabTitle img { /* Styles de positionnement des zones */ /* ============================================================================== */ +td.vmenu { + + margin-right:2px; + padding:0px; + width:170px; + /* border-right: 1px solid #666666; */ + +} + div.fiche { - margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px; + padding:8px 12px 10px; + margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'16':'24'; ?>px; margin-: browser->phone)?'12':'6'; ?>px; } @@ -670,9 +662,9 @@ div.ficheaddleft { /* ============================================================================== */ /* boutons : */ -.button, .butAction {background: #999;border: solid 1px #666;} -.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6)} -.butActionDelete {background: #b33c37;border:solid 1px #8d2f2b;} +.button, .butAction {background: #999; border: solid 1px #888; font-weight: normal; } +.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6); font-weight: normal;} +.butActionDelete {background: #b33c37; border:solid 1px #8d2f2b; font-weight: normal;} .button, .butAction, .butActionRefused, .butActionDelete { padding:2px; @@ -701,9 +693,9 @@ border-left: solid 1px rgba(0,0,0,.3); ); } -.button, a.butAction{color:black;} +.button, a.butAction {color: white; font-weight: normal !important;} -.butActionDelete{color:white;} +.butAction, .butActionDelete {color:white;} td.formdocbutton {padding-top:6px;} @@ -720,6 +712,7 @@ td.formdocbutton {padding-top:6px;} color-stop(1, rgba(255,255,255,.3)), color-stop(0, rgba(0,0,0,.3)) ); + color:white; } /* ============================================================================== */ @@ -873,6 +866,7 @@ tr.liste_titre, tr.box_titre { color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); + height: 22px; } tr.box_titre td.boxclose { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index aa3e808366b..c0cb4ed479b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -108,7 +108,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { $conf->global->THEME_ELDY_TOPMENU_BACK1='180,196,216'; // topmenu $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,226'; - $conf->global->THEME_ELDY_VERMENU_BACK1='246,248,250'; // vmenu + $conf->global->THEME_ELDY_VERMENU_BACK1='253,253,253'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='226,228,230'; // vmenu (not menu) $conf->global->THEME_ELDY_VERMENU_BACK2='220,224,227'; $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays @@ -397,12 +397,9 @@ div#tmenu_tooltip { ?> background: rgb(); background: rgb(); - /* background: #305582; *//* 2C68A3 */ @@ -419,7 +416,6 @@ div.tmenudiv { border-top: 0px solid #D3E5EC; border-: 0px; border-: 0px solid #555555; - border-bottom: 1px solid #FFFFFF; padding: 0px 0px 0px 0px; /* t r b l */ margin: 0px 0px 0px 0px; /* t r b l */ font-size: 13px; @@ -433,8 +429,11 @@ div.tmenudiv { /* background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ /* background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); */ background: url() 50% 0% repeat-x; + border-bottom: 1px solid rgb(); + box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; - background-image: url(); + border-bottom: 1px solid #DDDDDD; + background-image: url(); background-position:top; background-repeat:repeat-x; @@ -840,11 +839,12 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks margin: 1px 0px 8px 2px; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 80%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); +/* background-image: -webkit-linear-gradient(bottom, rgb() 20px, rgb() 100%); */ + background-image: -webkit-linear-gradient(top, rgb() 0px, rgb() 10px); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); background-image: url(); background-position:top; @@ -858,7 +858,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - } div.blockvmenusearch @@ -876,11 +875,11 @@ div.blockvmenusearch background: #E3E6E8; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); border-left: 1px solid #CCCCCC; @@ -910,11 +909,11 @@ div.blockvmenubookmarksold background: #E3E6E8; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); border-left: 1px solid #CCCCCC; From 0889bdc3ebbdc3f4ccd95e8246c197e3563bc819 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Jan 2013 23:20:00 +0100 Subject: [PATCH 5/7] Fix: Error using static method --- htdocs/comm/action/class/actioncomm.class.php | 7 +++---- htdocs/core/class/html.formactions.class.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 3c16a67205a..2ec2e5c3253 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -541,7 +541,7 @@ class ActionComm extends CommonObject * @param int $fk_element Id of element action is linked to * @param string $elementtype Type of element action is linked to * @param string $filter Other filter - * @return array <0 if KO, array with actions + * @return array or string Error string if KO, array with actions if OK */ static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='') { @@ -580,9 +580,8 @@ class ActionComm extends CommonObject return $resarray; } else - { - $this->error=$db->lasterror(); - return -1; + { + return $db->lasterror(); } } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 04dd81a3da5..cf18ea17974 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -145,7 +145,7 @@ class FormActions require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement); - if (is_numeric($listofactions) && $listofactions < 0) dol_print_error($this->db,'FailedToGetActions'); + if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions'); $num = count($listofactions); if ($num) From 47482202acc41e9020b82a6f0dd4f6b5a841e02c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Jan 2013 10:28:22 +0100 Subject: [PATCH 6/7] Fix: Missing picto --- htdocs/theme/amarok/img/object_holiday.png | Bin 0 -> 805 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/theme/amarok/img/object_holiday.png diff --git a/htdocs/theme/amarok/img/object_holiday.png b/htdocs/theme/amarok/img/object_holiday.png new file mode 100644 index 0000000000000000000000000000000000000000..69ccdb279a55ed5f6ef24fe152436652e26f6ac6 GIT binary patch literal 805 zcmV+=1KRwFP)}l(nrp&HE z)y*=VS4CjtQloY`xc_ju6i;Z+hK!|h&8LOT=_HDsPAW^C*o`Stp{M+GHF$1Wf!=Iu zRsz%KEk&O>J}FqqOcGocEjD8ob>ISuRH*}oNhF?7JKhoa{;YLBS3>o})>>w=hUV>? zUHF1YUPMyZvjGM>+LTu(Z2!PPu+|V6fRU?-dWPKOpsr|z#lOuQ2X7*K< z5S~kO_eGN8d_5mMzrs!V2}0qB-1f^4EsITsxq<6n-?e_{_9Pyk&=)$`Q6gd&liay; zn?R0};&p4OG>&nH@EPyK&t;oyx|k%5ZeBNO-LCByKOvLAHSO6=a2h!J@ zs`fn{pR9c}F*TVd>ML?ZgLx{JIMDvj^iANkFmR;0rEm15x78c#2b>FF7ErglEEZiR z@%@?ZiQWH((@}uh^~R0)qV5?G0?=Ik(KBH(t&nws&Tlgt{`MT|>IFnVymp|Xwa@=@ zwzV_Rz95|j!hpKC1I=P_bg#=@^s%|xnwwLl)o74R!q8+eTEF+STm~2y;N((=w`9&V jls5df+w~Rj-j96?SQRd&kr!>V00000NkvXXu0mjf9lVJA literal 0 HcmV?d00001 From 77f177d8462382d23363544cfe201ed7e20cbcc0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Jan 2013 11:04:29 +0100 Subject: [PATCH 7/7] Fix: Bad selection of option --- htdocs/core/lib/usergroups.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 3094cccaae0..76a80ffe05d 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -229,8 +229,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) $dirthemes=array_merge(array($forcethemedir.'/theme'),(array) $conf->modules_parts['themes']); } - $selected_theme=$conf->global->MAIN_THEME; - if (! empty($fuser->conf->MAIN_THEME)) $selected_theme=$fuser->conf->MAIN_THEME; + $selected_theme=''; + if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME; + else $selected_theme=empty($fuser->conf->MAIN_THEME)?'':$fuser->conf->MAIN_THEME; $colspan=2; if ($foruserprofile) $colspan=4;