diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4ea63ed8081..1ecdb9b61f4 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4734,33 +4734,47 @@ class Form //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam"; $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix); - $previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'':''; - $next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'':''; + //$previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'':''; + //$next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'':''; + $previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?'<':' ').'':''; + $next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?'>':' ').'':''; //print "xx".$previous_ref."x".$next_ref; - if ($previous_ref || $next_ref || $morehtml) { - $ret.='
'; - } + //if ($previous_ref || $next_ref || $morehtml) { + //$ret.=''; - $ret.=''; + //$ret.='
'; + $ret.='
'; + //} $ret.=dol_htmlentities($object->$fieldref); if ($morehtmlref) { $ret.=' '.$morehtmlref; } + $ret.='
'; + if ($previous_ref || $next_ref || $morehtml) + { + $ret.='
'.$morehtml; + //$ret.=''.$morehtml; + $ret.='
  • '.$morehtml.'
    • '; } if ($shownav && ($previous_ref || $next_ref)) { - $ret.='    		'.$previous_ref.''.$next_ref; + //$ret.=''.$previous_ref.''.$next_ref; + $ret.=''; + $ret.=''; } if ($previous_ref || $next_ref || $morehtml) { - $ret.='
    '; + //$ret.='
    '; + $ret.=''; } + $ret.=''; + return $ret; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a251eff75da..5ceb7dfa94b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -831,6 +831,25 @@ function dol_get_fiche_end($notab=0) else return ''; } +/** + * Show a string with the label tag dedicated to the HTML edit field. + * + * @param string $langkey Translation key + * @param string $fieldkey Key of the html select field the text refers to + * @param int $fieldrequired 1=Field is mandatory + */ +function fieldLabel($langkey, $fieldkey, $fieldrequired=0) +{ + global $conf, $langs; + $ret=''; + if ($fieldrequired) $ret.=''; + if (empty($conf->dol_use_jmobile)) $ret.=''; + if ($fieldrequired) $ret.=''; + return $ret; +} + /** * Return string to add class property on html element with pair/impair. * diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index f14652f6dc0..0a99b11e3aa 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -17,8 +17,8 @@ llxHeader();

    This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with
    - css (add parameter &theme=newtheme to test another theme or edit css of current theme)
    -- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
    -- no javascript / usage for bind people (add parameter nojs=1 to force disable javascript)
    +- jmobile (add parameter ">dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
    +- no javascript / usage for bind people (add parameter ">nojs=1 to force disable javascript)


    diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 810055da1f1..2414b41c3fe 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -230,15 +230,15 @@ if (empty($reshook)) { $object->particulier = GETPOST("private"); - $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('nom','alpha')?GETPOST('nom','alpha'):GETPOST('name','alpha')); + $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha')); $object->civility_id = GETPOST('civility_id', 'int'); // Add non official properties - $object->name_bis = GETPOST('name','alpha')?GETPOST('name','alpha'):GETPOST('nom','alpha'); + $object->name_bis = GETPOST('name','alpha'); $object->firstname = GETPOST('firstname','alpha'); } else { - $object->name = GETPOST('name', 'alpha')?GETPOST('name', 'alpha'):GETPOST('nom', 'alpha'); + $object->name = GETPOST('name', 'alpha'); } $object->address = GETPOST('address', 'alpha'); $object->zip = GETPOST('zipcode', 'alpha'); @@ -796,7 +796,7 @@ else if (GETPOST("type")=='p') { $object->client=2; } if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || (GETPOST("type")=='' && empty($conf->global->THIRDPARTY_NOTSUPPLIER_BY_DEFAULT)))) { $object->fournisseur=1; } - $object->name = GETPOST('nom', 'alpha'); + $object->name = GETPOST('name', 'alpha'); $object->firstname = GETPOST('firstname', 'alpha'); $object->particulier = $private; $object->prefix_comm = GETPOST('prefix_comm'); @@ -963,14 +963,14 @@ else print ''; if ($object->particulier || $private) { - print ''; + print ''.$langs->trans('LastName','name').''; } else { - print ''; + print ''.fieldLabel('ThirdPartyName','name').''; } print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; - print ''; + print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { print ''.$langs->trans('Prefix').''; @@ -980,16 +980,16 @@ else // If javascript on, we show option individual if ($conf->use_javascript_ajax) { - print ''; + print ''.fieldLabel('FirstName','firstname').''; print ''; print ' '; - print ''; + print ''.fieldLabel('UserTitle','cibility_id').''; print $formcompany->select_civility($object->civility_id).''; print ' '; } // Prospect/Customer - print ''; + print ''.fieldLabel('ProspectCustomer','customerprospect',1).''; print ''; - print ''; + print ''.fieldLabel('CustomerCode','customer_code').''; print ''; - print ''; - print '
    '; $tmpcode=$object->code_client; if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0); @@ -1013,10 +1013,10 @@ else { // Supplier print '
    '; + print ''.fieldLabel('Supplier','fournisseur',1).''; print $form->selectyesno("fournisseur",(isset($_POST['fournisseur'])?GETPOST('fournisseur'):$object->fournisseur),1); print ''; + print ''.fieldLabel('SupplierCode','supplier_code').''; print ''; // Barcode if (! empty($conf->barcode->enabled)) { - print ''; + print ''; print ''; } // Address - print ''; + print ''; print ''; // Zip / Town - print ''; // Country - print ''; @@ -1063,29 +1063,29 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''; } // Email web - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Skype if (! empty($conf->skype->enabled)) { - print ''; + print ''; print ''; } // Phone / Fax - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Prof ids @@ -1101,9 +1101,9 @@ else $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY'; if(empty($conf->global->$idprof_mandatory)) - print ''; @@ -1115,11 +1115,11 @@ else if ($j % 2 == 1) print ''; // Assujeti TVA - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Type - Size - print ''; - print ''; // Legal Form - print ''; + print ''; print ''; // Capital - print ''; + print ''; print ''; @@ -1202,7 +1202,7 @@ else if (! empty($conf->global->MAIN_MULTILANGS)) { - print ''; print ''; @@ -1212,7 +1212,7 @@ else { // Assign a Name print ''; - print ''; + print ''; print ''; @@ -1222,7 +1222,7 @@ else if (!empty($conf->incoterm->enabled)) { print ''; - print ''; + print ''; print ''; @@ -1231,12 +1231,12 @@ else // Categories if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { - print '"; } - + // Other attributes $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -1247,7 +1247,7 @@ else // Ajout du logo print ''; - print ''; + print ''; print ''; @@ -1319,10 +1319,10 @@ else $object->oldcopy=dol_clone($object); - if (GETPOST('nom')) + if (GETPOST('name')) { // We overwrite with values if posted - $object->name = GETPOST('nom', 'alpha'); + $object->name = GETPOST('name', 'alpha'); $object->prefix_comm = GETPOST('prefix_comm', 'alpha'); $object->client = GETPOST('client', 'int'); $object->code_client = GETPOST('code_client', 'alpha'); @@ -1452,13 +1452,13 @@ else print '
    '; $tmpcode=$object->code_fournisseur; if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1); @@ -1029,33 +1029,33 @@ else } // Status - print '
    '; + print '
    '.fieldLabel('Status','status').''; print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1); print '
    '.fieldLabel('Gencod','barcode').''; print '
    '.fieldLabel('Address','address').'
    '; + print '
    '.fieldLabel('Zip','zipcode').''; print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6); - print ''; + print ''.fieldLabel('Town','town').''; print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id')); print '
    '; + print '
    '.fieldLabel('Country','selectcountry_id').''; print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id)); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
    '; + print '
    '.fieldLabel('State','state_id').''; if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code); else print $countrynotdefined; print '
    '.fieldLabel('EMail','email').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'
    '.fieldLabel('Web','url').'
    '.fieldLabel('Skype','skype').'
    '.fieldLabel('Phone','phone').''.fieldLabel('Fax','fax').'
    '; + print ''.fieldLabel($idprof,$key).''; else - print ''; + print ''.fieldLabel($idprof,$key,1).''; print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code); print '
    '.fieldLabel('VATIsUsed','assujtva_value').''; print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation print ''.fieldLabel('VATIntra','inra_vat').''; $s = ''; @@ -1149,17 +1149,17 @@ else print '
    '."\n"; + print '
    '.fieldLabel('ThirdPartyType','typent_id').''."\n"; print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; + print ''.fieldLabel('Staff','effectif_id').''; print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id); if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
    '.fieldLabel('JuridicalStatus','legal_form').''; if ($object->country_id) { @@ -1172,7 +1172,7 @@ else print '
    '.fieldLabel('Capital','capital').' '; print ''.$langs->trans("Currency".$conf->currency).'
    '."\n"; + print '
    '.fieldLabel('DefaultLang','default_lang').''."\n"; print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1); print '
    '.fieldLabel('AllocateCommercial','commercial_id').''; $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default print '
    '.fieldLabel('IncotermLabel','incoterm_id').''; print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print '
    '.$langs->trans("Categories").''; + print '
    '.fieldLabel('Categories','custcats').''; $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1); print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%"); print "
    '.fieldLabel('Logo','photoinput').''; print ''; print '
    '; // Name - print ''; - print ''; + print ''; + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { - print ''; + print ''; print ''; - print '
    '.fieldLabel('ThirdPartyName','name',1).'
    '; + print '
    '.fieldLabel('Prefix','prefix').''; // It does not change the prefix mode using the auto numbering prefix if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm) { @@ -1473,14 +1473,14 @@ else } // Prospect/Customer - print '
    '.fieldLabel('ProspectCustomer','customerprospect',1).''; + print ''.fieldLabel('CustomerCode','customer_code').''; print ''; - print ''; - print '
    '; if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto) @@ -1510,10 +1510,10 @@ else if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire)) { print '
    '; + print ''.fieldLabel('Supplier','fournisseur',1).''; print $form->selectyesno("fournisseur",$object->fournisseur,1); print ''; + print ''.fieldLabel('SupplierCode','supplier_code').''; print ''; + print ''; print ''; } // Status - print ''; // Address - print ''; + print ''; print ''; // Zip / Town - print ''; // Country - print ''; @@ -1575,28 +1575,28 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''; } // EMail / Web - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Skype if (! empty($conf->skype->enabled)) { - print ''; + print ''; print ''; } // Phone / Fax - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Prof ids @@ -1612,9 +1612,9 @@ else $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY'; if(empty($conf->global->$idprof_mandatory)) - print ''; @@ -1626,12 +1626,12 @@ else if ($j % 2 == 1) print ''; // VAT payers - print ''; // VAT Code - print ''; + print ''; print ''; - print ''; // Juridical type - print ''; // Capital - print ''; + print ''; print ''; // Default language if (! empty($conf->global->MAIN_MULTILANGS)) { - print ''; print ''; @@ -1741,7 +1741,7 @@ else // Categories if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { - print ''; + print ''; print '"; } - + // Other attributes $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -1763,9 +1763,9 @@ else // Webservices url/key if (!empty($conf->syncsupplierwebservices->enabled)) { - print ''; + print ''; print ''; - print ''; + print ''; print ''; } @@ -1773,7 +1773,7 @@ else if (!empty($conf->incoterm->enabled)) { print ''; - print ''; + print ''; print ''; @@ -1781,7 +1781,7 @@ else // Logo print ''; - print ''; + print ''; print '"; } - + // Incoterms if (!empty($conf->incoterm->enabled)) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 25bb20432ff..2563440cf8c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1400,7 +1400,12 @@ div.tabs { clear:both; height:100%; } -div.tabsElem { margin-top: 1px; } /* To avoid overlap of tabs when not browser */ +div.tabsElem { + margin-top: 1px; + dol_use_jmobile)) { ?>; + margin-bottom: -1px; + +} /* To avoid overlap of tabs when not browser */ div.tabBar { color: #; @@ -1969,6 +1974,13 @@ table.liste td { /* Pagination */ +div.refid { + padding-top: dol_use_jmobile)?'8':'12'; ?>px; + font-weight: bold; + color: #766; + font-size: 120%; +} + div.pagination { float: right; } @@ -1987,8 +1999,10 @@ div.pagination li { display: inline-block; padding-left: 0px; padding-right: 0px; +dol_use_jmobile)) { ?> padding-top: 6px; - padding-bottom: 6px; + padding-bottom: 5px; + } .pagination { display: inline-block; @@ -1997,7 +2011,9 @@ div.pagination li { } div.pagination li.pagination a, div.pagination li.pagination span { +dol_use_jmobile)) { ?> padding: 6px 12px; + margin-left: -1px; line-height: 1.42857143; color: #000; @@ -2006,10 +2022,26 @@ div.pagination li.pagination span { div.pagination li.pagination span.inactive { cursor: default; } +div.pagination li.litext a { +border: none; + padding-right: 10px; + padding-left: 4px; + font-weight: bold; +} +dol_use_jmobile)) { ?> +div.pagination li.litext { + padding-top: 13px; + vertical-align: top; +} +dol_use_jmobile)) { ?> +div.pagination li.noborder a:hover { + border: none; + background-color: transparent; +} div.pagination li a, div.pagination li span { - background-color: #fff; + background-color: #fff; border: 1px solid #ddd; } div.pagination li:first-child a, @@ -3471,6 +3503,14 @@ ul.ulmenu { color: # !important; text-shadow: none !important; } +/* +.ui-btn-up-c { + background: transparent; +} +*/ +div.tabsElem a.tab { + background: transparent; +} .ui-controlgroup-horizontal .ui-btn.ui-first-child { -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px;
    '; if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) @@ -1543,31 +1543,31 @@ else // Barcode if (! empty($conf->barcode->enabled)) { - print '
    '.fieldLabel('Gencod','barcode').''; print '
    '; + print '
    '.fieldLabel('Status','status').''; print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status); print '
    '.fieldLabel('Address','address').'
    '; + print '
    '.fieldLabel('Zip','zipcode').''; print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6); - print ''; + print ''.fieldLabel('Town','town').''; print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id')); print '
    '; + print '
    '.fieldLabel('Country','selectcounty_id').''; print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
    '; + print '
    '.fieldLabel('State','state_id').''; print $formcompany->select_state($object->state_id,$object->country_code); print '
    '.fieldLabel('EMail','email',(! empty($conf->global->SOCIETE_MAIL_REQUIRED))).'
    '.fieldLabel('Web','url').'
    '.fieldLabel('Skype','skype').'
    '.fieldLabel('Phone','phone').''.fieldLabel('Fax','fax').'
    '; + print ''.fieldLabel($idprof,$key).''; else - print ''; + print ''.fieldLabel($idprof,$key).''; print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code); print '
    '; + print '
    '.fieldLabel('VATIsUsed','assujtva_value').''; print $form->selectyesno('assujtva_value',$object->tva_assuj,1); print ''.fieldLabel('VATIntra','intra_vat').''; $s =''; @@ -1664,7 +1664,7 @@ else //TODO: Place into a function to control showing by country or study better option if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print '
    '; + print '
    '.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').''; print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1); if(! isOnlyOneLocalTax(1)) { @@ -1673,7 +1673,7 @@ else print ''; } - print ''; + print ''.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').''; print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1); if (! isOnlyOneLocalTax(2)) { @@ -1686,7 +1686,7 @@ else } elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1") { - print '
    '; + print '
    '.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').''; print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1); if(! isOnlyOneLocalTax(1)) { @@ -1699,7 +1699,7 @@ else } elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1") { - print '
    '; + print '
    '.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').''; print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1); if(! isOnlyOneLocalTax(2)) { @@ -1711,28 +1711,28 @@ else } // Type - Size - print '
    '; + print '
    '.fieldLabel('ThirdPartyType','typent_id').''; print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; + print ''.fieldLabel('Staff','effectif_id').''; print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
    '; + print '
    '.fieldLabel('JuridicalStatus','legal_form').''; print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'legal_form'); print '
    '.fieldLabel('Capital','capital').''.$langs->trans("Currency".$conf->currency).'
    '."\n"; + print '
    '.fieldLabel('DefaultLang','default_lang').''."\n"; print $formadmin->select_language($object->default_lang,'default_lang',0,0,1); print '
    '.fieldLabel('Categories', 'custcats').''; $cate_arbo = $form->select_all_categories( Categorie::TYPE_CUSTOMER, null, null, null, null, 1); $c = new Categorie( $db ); @@ -1752,7 +1752,7 @@ else print $form->multiselectarray( 'custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%'); print "
    '.fieldLabel('WebServiceURL','webservices_url').''.fieldLabel('WebServiceKey','webservices_key').'
    '.fieldLabel('IncotermLabel','incoterm_id').''; print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print '
    '.fieldLabel('Logo','photoinput').''; if ($object->logo) print $form->showphoto('societe',$object); $caneditfield=1; @@ -2187,7 +2187,7 @@ else print $form->showCategories( $object->id, 'customer', 1 ); print "