diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index a9164676716..a44a79da1f0 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -218,17 +218,15 @@ if ($id > 0) dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company'); + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + print '
'; - + print '
'; print ''; - print ''; - // Alias name (commercial, trademark or alias name) - print '"; @@ -264,39 +262,6 @@ if ($id > 0) print ''; } - // Address - print '"; - - // Zip / Town - print ''; - print '"; - print ''; - - // Country - print ''; - - // EMail - print ''; - - // Web - print ''; - - // Phone - print ''; - - // Fax - print ''; - // Skype if (! empty($conf->skype->enabled)) { diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index ea9e1382d40..0edcdcd0c1d 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -52,9 +52,9 @@ if (GETPOST('cancel') && ! empty($backtopage)) if (GETPOST("action") == 'setremise') { - $soc = New Societe($db); - $soc->fetch($_GET["id"]); - $result=$soc->set_remise_client($_POST["remise"],$_POST["note"],$user); + $object = new Societe($db); + $object->fetch($_GET["id"]); + $result=$object->set_remise_client($_POST["remise"],$_POST["note"],$user); if ($result > 0) { @@ -71,7 +71,7 @@ if (GETPOST("action") == 'setremise') } else { - setEventMessage($soc->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -93,51 +93,50 @@ llxHeader(); if ($socid > 0) { // On recupere les donnees societes par l'objet - $objsoc = new Societe($db); - $objsoc->id=$socid; - $objsoc->fetch($socid); + $object = new Societe($db); + $object->fetch($socid); - $head = societe_prepare_head($objsoc); + $head = societe_prepare_head($object); - print ''; + print ''; print ''; print ''; print ''; dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"),0,'company'); - - print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); - print '
'.$langs->trans('AliasNameShort').''; + print '
'.$langs->trans('AliasNameShort').''; print $object->name_alias; print "
'.$langs->trans('Address').''; - dol_print_address($object->address,'gmap','thirdparty',$object->id); - print "
'.$langs->trans('Zip').' / '.$langs->trans('Town').''.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town."
'.$langs->trans("Country").''; - if (! empty($object->country_code)) - { - //$img=picto_from_langcode($object->country_code); - $img=''; - if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); - else print ($img?$img.' ':'').$object->country; - } - print '
'.$langs->trans('EMail').''.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'
'.$langs->trans("Web").''.dol_print_url($object->url,'_blank').'
'.$langs->trans('Phone').''.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').''.$langs->trans('Fax').''.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'
'; - - // Name - print ''; - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans('Name').''; - print $form->showrefnav($objsoc,'id','',1,'rowid','nom'); - print '
'; // Remise - print '"; + print '"; print '
'; - print $langs->trans("CustomerRelativeDiscount").''.price2num($objsoc->remise_percent)."%
'; + print $langs->trans("CustomerRelativeDiscount").''.price2num($object->remise_percent)."%
'; print '
'; print load_fiche_titre($langs->trans("NewRelativeDiscount"),'',''); - print ''; + print '
'; // Nouvelle valeur - print ''; + print ''; // Motif/Note - print ''; + print ''; print "
'; - print $langs->trans("NewValue").'%
'; + print $langs->trans("NewValue").'%
'; - print $langs->trans("NoteReason").'
'; + print $langs->trans("NoteReason").'
"; + print '
'; + dol_fiche_end(); print '
'; @@ -160,7 +159,7 @@ if ($socid > 0) $sql = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,"; $sql.= " u.login, u.rowid as user_id"; $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u"; - $sql.= " WHERE rc.fk_soc =". $objsoc->id; + $sql.= " WHERE rc.fk_soc =". $object->id; $sql.= " AND u.rowid = rc.fk_user_author"; $sql.= " ORDER BY rc.datec DESC"; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 957f109268a..9b764ad1c8f 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -36,7 +36,7 @@ $action=GETPOST('action','alpha'); $backtopage=GETPOST('backtopage','alpha'); // Security check -$socid = GETPOST('id','int'); +$socid = GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int'); if ($user->societe_id > 0) { $socid = $user->societe_id; @@ -212,36 +212,34 @@ llxHeader('',$langs->trans("GlobalDiscount")); if ($socid > 0) { // On recupere les donnees societes par l'objet - $objsoc = new Societe($db); - $objsoc->id=$socid; - $objsoc->fetch($socid); + $object = new Societe($db); + $object->fetch($socid); /* * Affichage onglets */ - $head = societe_prepare_head($objsoc); + $head = societe_prepare_head($object); - print ''; + print ''; print ''; print ''; print ''; dol_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"),0,'company'); - print ''; - - // Name - print ''; - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans('Name').''; - print $form->showrefnav($objsoc,'id','',1,'rowid','nom'); - print '
'; // Calcul avoirs en cours $remise_all=$remise_user=0; $sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc"; - $sql.= " WHERE rc.fk_soc =". $objsoc->id; + $sql.= " WHERE rc.fk_soc =". $object->id; $sql.= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)"; $sql.= " GROUP BY rc.fk_user"; $resql=$db->query($sql); @@ -256,7 +254,7 @@ if ($socid > 0) dol_print_error($db); } - print ''; + print ''; print ''; print ''; @@ -271,13 +269,15 @@ if ($socid > 0) print ' '.$langs->trans("Currency".$conf->currency).''; print ''; print ''; print ''; print ''; print "
'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'
'.$langs->trans("CustomerAbsoluteDiscountAllUsers").''.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'
'.$langs->trans("CustomerAbsoluteDiscountMy").'
'.$langs->trans("VAT").''; - print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$objsoc); + print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$object); print '
'.$langs->trans("NoteReason").'
"; + print '
'; + dol_fiche_end(); print '
'; @@ -296,7 +296,7 @@ if ($socid > 0) if ($_GET['action'] == 'remove') { - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&remid='.$_GET["remid"], $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1); + print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$_GET["remid"], $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1); } /* @@ -309,7 +309,7 @@ if ($socid > 0) $sql.= " fa.facnumber as ref, fa.type as type"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid"; - $sql.= " WHERE rc.fk_soc =". $objsoc->id; + $sql.= " WHERE rc.fk_soc =". $object->id; $sql.= " AND u.rowid = rc.fk_user"; $sql.= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)"; $sql.= " ORDER BY rc.datec DESC"; @@ -375,9 +375,9 @@ if ($socid > 0) if ($user->rights->societe->creer || $user->rights->facture->creer) { print ''; - print 'rowid.'">'.img_picto($langs->trans("SplitDiscount"),'split').''; + print 'rowid.'">'.img_picto($langs->trans("SplitDiscount"),'split').''; print '   '; - print 'rowid.'">'.img_delete($langs->trans("RemoveDiscount")).''; + print 'rowid.'">'.img_delete($langs->trans("RemoveDiscount")).''; print ''; } else print ' '; @@ -403,7 +403,7 @@ if ($socid > 0) array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5') ); $langs->load("dict"); - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&remid='.$showconfirminfo['rowid'], $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($showconfirminfo['amount_ttc']),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0); + print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'], $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($showconfirminfo['amount_ttc']),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0); } } else @@ -429,7 +429,7 @@ if ($socid > 0) $sql.= " , ".MAIN_DB_PREFIX."facturedet as fc"; $sql.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid"; - $sql.= " WHERE rc.fk_soc =". $objsoc->id; + $sql.= " WHERE rc.fk_soc =". $object->id; $sql.= " AND rc.fk_facture_line = fc.rowid"; $sql.= " AND fc.fk_facture = f.rowid"; $sql.= " AND rc.fk_user = u.rowid"; @@ -446,7 +446,7 @@ if ($socid > 0) $sql2.= " , ".MAIN_DB_PREFIX."user as u"; $sql2.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc"; $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid"; - $sql2.= " WHERE rc.fk_soc =". $objsoc->id; + $sql2.= " WHERE rc.fk_soc =". $object->id; $sql2.= " AND rc.fk_facture = f.rowid"; $sql2.= " AND rc.fk_user = u.rowid"; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 19f32cbfa88..86c5f717f4b 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -58,6 +58,16 @@ function societe_prepare_head(Societe $object) $head[$h][2] = 'customer'; $h++; } + if (($object->client==1 || $object->client==2 || $object->client==3) && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))) + { + $langs->load("products"); + // price + $head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id; + $head[$h][1] = $langs->trans("CustomerPrices"); + $head[$h][2] = 'price'; + $h++; + } + if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) { $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id; @@ -169,16 +179,6 @@ function societe_prepare_head(Societe $object) $h++; } - if (($object->client==1 || $object->client==2 || $object->client==3) && (! empty ( $conf->global->PRODUIT_CUSTOMER_PRICES ))) - { - $langs->load("products"); - // price - $head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id; - $head[$h][1] = $langs->trans("CustomerPrices"); - $head[$h][2] = 'price'; - $h++; - } - // Log $head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id; $head[$h][1] = $langs->trans("Info"); diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 5773d7ce9d8..8400e0210d4 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -21,7 +21,7 @@ $module = $object->element; $note_public = 'note_public'; $note_private = 'note_private'; -$colwidth=(isset($colwidth)?$colwidth:25); +$colwidth=(isset($colwidth)?$colwidth:(empty($cssclass)?'25':'')); $permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0)); // If already defined by caller page $moreparam=(isset($moreparam)?$moreparam:''); @@ -69,12 +69,12 @@ else $typeofdata='textarea:12:100';
-
>editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam); ?>
+
>editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam); ?>
editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam); ?>
societe_id)) { ?>
-
>editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam); ?>
+
>editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam); ?>
editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam); ?>
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 55993221d41..805fe307115 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -131,16 +131,15 @@ if ($object->id > 0) dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company'); - + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + print '
'; + print '
'; print ''; - print ''; // Alias names (commercial, trademark or alias names) - print '"; @@ -168,35 +167,6 @@ if ($object->id > 0) print ''; } - // Address - print ''; - - // Zip / Town - print ''; - print ''; - - // Country - print ''; - - // EMail - print ''; - - // Web - print ''; - - // Phone - print ''; - - // Fax - print ''; - // Assujetti a TVA ou pas print ''; print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); - print '
'.$langs->trans('AliasNameShort').''; + print '
'.$langs->trans('AliasNameShort').''; print $object->name_alias; print "
'.$langs->trans("Address").''; - dol_print_address($object->address,'gmap','thirdparty',$object->id); - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'
'.$langs->trans("Country").''; - //$img=picto_from_langcode($object->country_code); - $img=''; - if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); - else print ($img?$img.' ':'').$object->country; - print '
'.$langs->trans('EMail').''.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'
'.$langs->trans("Web").''.dol_print_url($object->url).'
'.$langs->trans("Phone").''.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').''.$langs->trans("Fax").''.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'
'.$langs->trans('VATIsUsed').''; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index ee1b32084ff..ac04c689df4 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -101,6 +101,7 @@ CorrectStock=Correct stock AddPhoto=Add photo ListOfStockMovements=List of stock movements BuyingPrice=Buying price +PriceForEachProduct=Products with specific prices SupplierCard=Supplier card CommercialCard=Commercial card AllWays=Path to find your product in stock diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 847c23c6719..b35715ce1ab 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -80,14 +80,15 @@ if ($socid) dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"),0,'company'); - print ''; - - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'; // Alias names (commercial, trademark or alias names) - print '"; @@ -114,47 +115,11 @@ if ($socid) print ''; } - if (! empty($conf->barcode->enabled)) - { - print ''; - } - - print ""; - - // Zip / Town - print '"; - print '"; - - // Country - if ($object->country) { - print ''; - } - - // EMail - print ''; - - // Web - print ''; - - // Phone / Fax - print ''; - print ''; - print '
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'.$langs->trans('Gencod').''.$object->barcode.'
".$langs->trans('Address').""; - dol_print_address($object->address, 'gmap', 'thirdparty', $object->id); - print "
'.$langs->trans('Zip').''.$object->zip."'.$langs->trans('Town').''.$object->town."
'.$langs->trans('Country').''; - //$img=picto_from_langcode($object->country_code); - $img=''; - print ($img?$img.' ':''); - print $object->country; - print '
'.$langs->trans('EMail').''; - print dol_print_email($object->email,0,$object->id,'AC_EMAIL'); - print '
'.$langs->trans('Web').''; - print dol_print_url($object->url); - print '
'.$langs->trans('Phone').''.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').''.$langs->trans('Fax').''.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'
'; print ''; + dol_fiche_end(); /* * Barre d'action diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 05679cef5bb..12a1612ab1d 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -33,7 +33,7 @@ $langs->load("suppliers"); $langs->load("banks"); // Security check -$socid = isset($_GET["socid"])?$_GET["socid"]:''; +$socid = GETPOST("socid"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); @@ -50,18 +50,18 @@ if($_GET["socid"] && $_GET["commid"]) if ($user->rights->societe->creer) { - $soc = new Societe($db); - $soc->id = $_GET["socid"]; - $soc->fetch($_GET["socid"]); + $object = new Societe($db); + $object->id = $_GET["socid"]; + $object->fetch($_GET["socid"]); $parameters=array('id'=>$_GET["commid"]); - $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - if (empty($reshook)) $soc->add_commercial($user, $_GET["commid"]); + if (empty($reshook)) $object->add_commercial($user, $_GET["commid"]); - header("Location: commerciaux.php?socid=".$soc->id); + header("Location: commerciaux.php?socid=".$object->id); exit; } else @@ -71,23 +71,23 @@ if($_GET["socid"] && $_GET["commid"]) } } -if($_GET["socid"] && $_GET["delcommid"]) +if ($socid && $_GET["delcommid"]) { $action = 'delete'; if ($user->rights->societe->creer) { - $soc = new Societe($db); - $soc->id = $_GET["socid"]; - $soc->fetch($_GET["socid"]); + $object = new Societe($db); + $object->id = $_GET["socid"]; + $object->fetch($_GET["socid"]); $parameters=array('id'=>$_GET["delcommid"]); - $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - if (empty($reshook)) $soc->del_commercial($user, $_GET["delcommid"]); + if (empty($reshook)) $object->del_commercial($user, $_GET["delcommid"]); - header("Location: commerciaux.php?socid=".$soc->id); + header("Location: commerciaux.php?socid=".$object->id); exit; } else @@ -107,63 +107,44 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url); $form = new Form($db); -if ($_GET["socid"]) +if ($socid) { - $soc = new Societe($db); - $soc->id = $_GET["socid"]; - $result=$soc->fetch($_GET["socid"]); + $object = new Societe($db); + $result=$object->fetch($socid); $action='view'; - $head=societe_prepare_head2($soc); + $head=societe_prepare_head2($object); dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"),0,'company'); - /* - * Fiche societe en mode visu - */ + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; - print ''; - - print ''; - print ''; + print '
'; + print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'; print ''; - print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; - print $soc->code_client; - if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); + print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; + print $object->code_client; + if ($object->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { - print ''; + print ''; } print ''; print ''; - print ""; - - print '"; - print '"; - - print ''; - - print ''; - print ''; - - print ''; - // Liste les commerciaux - print ''; + print ''; print '
'.$langs->trans('CustomerCode').''.$langs->trans('CustomerCode').''.$langs->trans('Prefix').''.$soc->prefix_comm.''.$langs->trans('Prefix').''.$object->prefix_comm.'
".$langs->trans('Address')."".nl2br($soc->address)."
'.$langs->trans('Zip').''.$soc->zip."'.$langs->trans('Town').''.$soc->town."
'.$langs->trans('Country').''.$soc->country.'
'.$langs->trans('Phone').''.dol_print_phone($soc->phone,$soc->country_code,0,$soc->id,'AC_TEL').''.$langs->trans('Fax').''.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'
'.$langs->trans('Web').''; - if ($soc->url) { print 'http://'.$soc->url.''; } - print '
'.$langs->trans("SalesRepresentatives").'
'.$langs->trans("SalesRepresentatives").''; $sql = "SELECT u.rowid, u.lastname, u.firstname"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE sc.fk_soc =".$soc->id; + $sql .= " WHERE sc.fk_soc =".$object->id; $sql .= " AND sc.fk_user = u.rowid"; $sql .= " ORDER BY u.lastname ASC "; dol_syslog('societe/commerciaux.php::list salesman sql = '.$sql,LOG_DEBUG); @@ -177,7 +158,7 @@ if ($_GET["socid"]) { $obj = $db->fetch_object($resql); - $parameters=array('socid'=>$soc->id); + $parameters=array('socid'=>$object->id); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { @@ -210,6 +191,8 @@ if ($_GET["socid"]) print '
'; print "
\n"; + + dol_fiche_end(); if ($user->rights->societe->creer && $user->rights->societe->client->voir) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index e075f67cdaf..e6207782e9c 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -116,14 +116,15 @@ if (empty($socid)) $head = societe_prepare_head($object); dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"),0,'company'); +dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + +print '
'; + +print '
'; print ''; -print ''; -print ''; // Alias names (commercial, trademark or alias names) -print ''; +print ''; print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field @@ -173,6 +174,8 @@ if ($object->fournisseur) } print '
'.$langs->trans('ThirdPartyName').''; -print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); -print '
'.$object->name_alias.'
'; +print '
'; + dol_fiche_end(); print '
'; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index f1961e02b2d..2c951ed8670 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -109,17 +109,15 @@ if ($object->id) $totalsize+=$file['size']; } - - print ''; - - // Ref - print ''; - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'; // Alias names (commercial, trademark or alias names) - print '"; @@ -155,6 +153,8 @@ if ($object->id) print '
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'; + print ''; + dol_fiche_end(); $modulepart = 'societe'; diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php index c7db3b66645..ceb5fa6eac5 100644 --- a/htdocs/societe/note.php +++ b/htdocs/societe/note.php @@ -75,15 +75,15 @@ if ($id > 0) print ''; print ''; - print ''; - - print ''; - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'; // Alias names (commercial, trademark or alias names) - print '"; @@ -112,9 +112,12 @@ if ($id > 0) print "
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
"; + print ''; + print '
'; - $colwidth='25'; + //$colwidth='25'; + $cssclass='titlefield'; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 483c156907a..1b85cf36ab7 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -142,15 +142,15 @@ if ($result > 0) dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company'); - - print ''; - - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'; // Alias names (commercial, trademark or alias names) - print '"; @@ -186,6 +186,8 @@ if ($result > 0) print ''; print '
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'; + print ''; + dol_fiche_end(); // Help @@ -248,6 +250,7 @@ if ($result > 0) print '
'; + print ''; print '
'; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 20805502c11..fd41c276bf2 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -120,90 +120,58 @@ if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user- $form = new Form($db); -$soc = new Societe($db); +$object = new Societe($db); -$result = $soc->fetch($socid); +$result = $object->fetch($socid); llxHeader("", $langs->trans("ThirdParty") . '-' . $langs->trans('PriceByCustomer')); if (! empty($conf->notification->enabled)) $langs->load("mails"); -$head = societe_prepare_head($soc); +$head = societe_prepare_head($object); dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), 0, 'company'); -print ''; +dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + +print '
'; -print '
'; +print '
'; +print '
' . $langs->trans("ThirdPartyName") . ''; -print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom'); -print '
'; // Alias names (commercial, trademark or alias names) -print '"; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { - print ''; + print ''; } -if ($soc->client) { +if ($object->client) { print ''; } -if ($soc->fournisseur) { +if ($object->fournisseur) { print ''; } -if (! empty($conf->barcode->enabled)) { - print ''; -} - -print ""; - -// Zip / Town -print '"; -print '"; - -// Country -if ($soc->country) { - print ''; -} - -// EMail -print ''; - -// Web -print ''; - -// Phone / Fax -print ''; -print ''; - print '
'.$langs->trans('AliasNames').''; -print $soc->name_alias; +print '
'.$langs->trans('AliasNames').''; +print $object->name_alias; print "
' . $langs->trans('Prefix') . '' . $soc->prefix_comm . '
' . $langs->trans('Prefix') . '' . $object->prefix_comm . '
'; print $langs->trans('CustomerCode') . ''; - print $soc->code_client; - if ($soc->check_codeclient() != 0) + print $object->code_client; + if ($object->check_codeclient() != 0) print ' (' . $langs->trans("WrongCustomerCode") . ')'; print '
'; print $langs->trans('SupplierCode') . ''; - print $soc->code_fournisseur; - if ($soc->check_codefournisseur() != 0) + print $object->code_fournisseur; + if ($object->check_codefournisseur() != 0) print ' (' . $langs->trans("WrongSupplierCode") . ')'; print '
' . $langs->trans('Gencod') . '' . $soc->barcode . '
" . $langs->trans('Address') . ""; -dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id); -print "
' . $langs->trans('Zip') . '' . $soc->zip . "' . $langs->trans('Town') . '' . $soc->town . "
' . $langs->trans('Country') . ''; - $img = picto_from_langcode($soc->country_code); - print($img ? $img . ' ' : ''); - print $soc->country; - print '
' . $langs->trans('EMail') . ''; -print dol_print_email($soc->email, 0, $soc->id, 'AC_EMAIL'); -print '
' . $langs->trans('Web') . ''; -print dol_print_url($soc->url); -print '
' . $langs->trans('Phone') . '' . dol_print_phone($soc->tel, $soc->country_code, 0, $soc->id, 'AC_TEL') . '' . $langs->trans('Fax') . '' . dol_print_phone($soc->fax, $soc->country_code, 0, $soc->id, 'AC_FAX') . '
'; print '
'; +dol_fiche_end(); + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $prodcustprice = new Productcustomerprice($db); @@ -224,7 +192,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Build filter to diplay only concerned lines $filter = array ( - 't.fk_soc' => $soc->id + 't.fk_soc' => $object->id ); $search_soc = GETPOST('search_soc'); @@ -238,10 +206,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print load_fiche_titre($langs->trans('PriceByCustomer')); - print '
'; + print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -316,7 +284,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { setEventMessage($prodcustprice->error, 'errors'); } - print ''; + print ''; print ''; print ''; print ''; @@ -456,9 +424,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { } print "\n" . '
' . "\n"; - print ''; + print ''; print "\n

\n"; - } else { + } + else + { // View mode @@ -475,7 +445,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $option = '&search_soc=' . $search_soc . '&id=' . $object->id; - print_barre_liste($langs->trans('PriceByCustomer'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords); + print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords); if (count($prodcustprice->lines) > 0) { @@ -536,15 +506,15 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Action if ($user->rights->produit->creer || $user->rights->service->creer) { print ''; @@ -568,7 +538,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print "\n" . '
' . "\n"; if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''; + print ''; } print "\n

\n"; } diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index ee4259f2e81..fd9f6b34217 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -42,9 +42,8 @@ $socid = GETPOST("socid"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); -$soc = new Societe($db); -$soc->id = $_GET["socid"]; -$soc->fetch($_GET["socid"]); +$object = new Societe($db); +$object->fetch($socid); $id=GETPOST("id","int"); $ribid=GETPOST("ribid","int"); @@ -62,7 +61,7 @@ if ($action == 'update' && ! $_POST["cancel"]) $account->fetch($id); - $account->socid = $soc->id; + $account->socid = $object->id; $account->bank = $_POST["bank"]; $account->label = $_POST["label"]; @@ -93,7 +92,7 @@ if ($action == 'update' && ! $_POST["cancel"]) $account->setAsDefault($id); // This will make sure there is only one default rib } - $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id; + $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id; header('Location: '.$url); exit; } @@ -121,7 +120,7 @@ if ($action == 'add' && ! $_POST["cancel"]) // Ajout $account = new CompanyBankAccount($db); - $account->socid = $soc->id; + $account->socid = $object->id; $account->bank = $_POST["bank"]; $account->label = $_POST["label"]; @@ -146,7 +145,7 @@ if ($action == 'add' && ! $_POST["cancel"]) } else { - $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id; + $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id; header('Location: '.$url); exit; } @@ -159,7 +158,7 @@ if ($action == 'setasdefault') $res = $account->setAsDefault(GETPOST('ribid','int')); if ($res) { - $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id; + $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id; header('Location: '.$url); exit; } else { @@ -175,7 +174,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes') $result = $account->delete($user); if ($result > 0) { - $url = $_SERVER['PHP_SELF']."?socid=".$soc->id; + $url = $_SERVER['PHP_SELF']."?socid=".$object->id; header('Location: '.$url); exit; } @@ -200,27 +199,27 @@ $prelevement = new BonPrelevement($db); llxHeader(); -$head=societe_prepare_head2($soc); +$head=societe_prepare_head2($object); $account = new CompanyBankAccount($db); if (! $id) - $account->fetch(0,$soc->id); + $account->fetch(0,$object->id); else $account->fetch($id); -if (empty($account->socid)) $account->socid=$soc->id; +if (empty($account->socid)) $account->socid=$object->id; if ($socid && $action == 'edit' && $user->rights->societe->creer) { - print ''; + print ''; print ''; print ''; print ''; } if ($socid && $action == 'create' && $user->rights->societe->creer) { - print ''; + print ''; print ''; print ''; } @@ -234,17 +233,22 @@ if ($socid && $action != 'edit' && $action != "create") // Confirm delete third party if ($action == 'delete') { - print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$soc->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1); + print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1); } - print load_fiche_titre($langs->trans("DefaultRIB")); + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print load_fiche_titre($langs->trans("DefaultRIB"), '', ''); - print '
' . $langs->trans('Product') . ''; - print 'id . '&prodid=' . $line->fk_product . '">'; + print 'id . '&prodid=' . $line->fk_product . '">'; print img_info(); print ''; print ' '; - print 'id . '&lineid=' . $line->id . '">'; + print 'id . '&lineid=' . $line->id . '">'; print img_edit('default', 0, 'style="vertical-align: middle;"'); print ''; print ' '; - print 'id . '&lineid=' . $line->id . '">'; + print 'id . '&lineid=' . $line->id . '">'; print img_delete('default', 'style="vertical-align: middle;"'); print ''; print '
'; + print '
'; + print '
'; - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Show fields of bank account @@ -350,7 +354,9 @@ if ($socid && $action != 'edit' && $action != "create") print '
'.$langs->trans("RIBControlError").'
'; } - print "
"; + print ""; + + dol_fiche_end(); /* @@ -359,7 +365,7 @@ if ($socid && $action != 'edit' && $action != "create") print load_fiche_titre($langs->trans("AllRIB")); - $rib_list = $soc->get_all_rib(); + $rib_list = $object->get_all_rib(); $var = false; if (is_array($rib_list)) { @@ -397,7 +403,7 @@ if ($socid && $action != 'edit' && $action != "create") if (! empty($conf->prelevement->enabled)) { // RUM - print ''; + print ''; // FRSTRECUR print ''; @@ -406,7 +412,7 @@ if ($socid && $action != 'edit' && $action != "create") // Default print '
'.$langs->trans("LabelRIB").'
'.$langs->trans("LabelRIB").''.$account->label.'
'.$langs->trans("BankName").'
'.$langs->trans("BankName").''.$account->bank.'
'.$prelevement->buildRumNumber($soc->code_client, $rib->datec, $rib->id).''.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).''.$rib->frstrecur.''; if (!$rib->default_rib) { - print ''; + print ''; print img_picto($langs->trans("Disabled"),'off'); print ''; } else { @@ -418,13 +424,13 @@ if ($socid && $action != 'edit' && $action != "create") print ''; if ($user->rights->societe->creer) { - print ''; + print ''; print img_picto($langs->trans("Modify"),'edit'); print ''; print ' '; - print ''; + print ''; print img_picto($langs->trans("Delete"),'delete'); print ''; } @@ -444,7 +450,6 @@ if ($socid && $action != 'edit' && $action != "create") dol_print_error($db); } - dol_fiche_end(); } // Edit @@ -452,7 +457,12 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) { dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company'); - print ''; + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'; print ''; print ''; @@ -551,7 +561,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) print '
'.$langs->trans("LabelRIB").'
'; - if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($soc->code_client, $account->datec, $account->id); + if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id); // RUM print ''; @@ -564,7 +574,9 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) print '
'.$langs->trans("RUM").'
'; } - dol_fiche_end(); + print ''; + + dol_fiche_end(); print '
'; print ''; @@ -579,8 +591,12 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) { dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company'); - print ''; - + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'; print ''; print ''; @@ -657,6 +673,8 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) print '
'.$langs->trans("LabelRIB").'
'; } + print '
'; + dol_fiche_end(); print '
'; @@ -686,7 +704,7 @@ if ($socid && $action != 'edit' && $action != 'create') if ($user->rights->societe->creer) { - print ''.$langs->trans("Add").''; + print ''.$langs->trans("Add").''; } print '
'; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a603f52e226..6570a737967 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1881,47 +1881,11 @@ else print '
'; print ''; - // Ref - /* - print ''; - print ''; - print ''; - */ - - // Name - /* - print ''; - print ''; - print ''; - */ - // Alias names (commercial, trademark or alias names) - print '"; - // Logo+barcode - /* - $rowspan=6; - if (! empty($conf->global->SOCIETE_USEPREFIX)) $rowspan++; - if (! empty($object->client)) $rowspan++; - if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) $rowspan++; - if (! empty($conf->barcode->enabled)) $rowspan++; - if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++; - $htmllogobar=''; - if ($showlogo || $showbarcode) - { - $htmllogobar.=''; - }*/ - // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { @@ -1966,69 +1930,6 @@ else print ''; } - // Status - /* - print ''; - print ''; - print $htmllogobar; $htmllogobar=''; - print ''; - */ - - // Address - /* - print ''; - - // Zip / Town - print ''; - print ''; - - // Country - print ''; - - // State - if (empty($conf->global->SOCIETE_DISABLE_STATE)) print ''; - - // EMail - print ''; - - // Web - print ''; - - // Skype - if (! empty($conf->skype->enabled)) - { - print ''; - } - - // Phone / Fax - print ''; - print ''; - */ - // Prof ids $i=1; $j=0; while ($i <= 6) diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index 4d2382e6eee..691f930b767 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -148,14 +148,16 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - print '
'.$langs->trans("Ref").''; - print $fuser->id; - print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); - print '
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'; - if ($showlogo) $htmllogobar.=$form->showphoto('societe',$object); - if ($showlogo && $showbarcode) $htmllogobar.='

'; - if ($showbarcode) $htmllogobar.=$form->showbarcode($object); - $htmllogobar.='
'.$langs->trans("Status").''; - if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { - print ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased'); - } else { - print $object->getLibStatut(2); - } - print '
'.$langs->trans('Address').''; - dol_print_address($object->address,'gmap','thirdparty',$object->id); - print '
'.$langs->trans('Zip').' / '.$langs->trans("Town").''; - print $object->zip.($object->zip && $object->town?" / ":"").$object->town; - print '
'.$langs->trans("Country").''; - if (! empty($object->country_code)) - { - //$img=picto_from_langcode($object->country_code); - $img=''; - if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); - else print ($img?$img.' ':'').$object->country; - } - print '
'.$langs->trans('State').''.$object->state.'
'.$langs->trans('EMail').''; - print dol_print_email($object->email,0,$object->id,'AC_EMAIL'); - print '
'.$langs->trans('Web').''; - print dol_print_url($object->url); - print '
'.$langs->trans('Skype').''; - print dol_print_skype($object->skype,0,$object->id,'AC_SKYPE'); - print '
'.$langs->trans('Phone').''.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').''.$langs->trans('Fax').''.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'
'; - print ''; - print ''; + + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($object,'id','',($user->societe_id?0:1),'rowid','nom'); - print '
'; // Alias names (commercial, trademark or alias names) - print '"; @@ -181,7 +183,11 @@ if ($id > 0 || ! empty($ref)) if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; print ''; } - print '
'.$langs->trans('AliasNames').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'; + print '
'; + + print '
'; + + print ''; print '
'; // Contacts lines (modules that overwrite templates must declare this into descriptor) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 638c758ddc2..5f9d0e4bb15 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -489,7 +489,7 @@ div.confirmmessage { .maxwidth100 { max-width: 100px; } .maxwidth200 { max-width: 200px; } .maxwidth300 { max-width: 300px; } -.titlefield { width: 25%; } +.titlefield { width: 30%; } .hideonsmartphone { display: none; } .noenlargeonsmartphone { width : 50px !important; display: inline !important; } @@ -625,7 +625,7 @@ div.divphotoref { div.statusref { float: right; padding-right: 12px; - margin-top: 7px; + margin-top: 6px; margin-bottom: 10px; } img.photoref { @@ -1970,7 +1970,7 @@ td.border, div.tagtable div div.border { } .table-key-border-col { - width: 25%; + /* width: 25%; */ vertical-align:top; } .table-val-border-col { @@ -2133,6 +2133,9 @@ div.pagination li.pagination span { div.pagination li.pagination span.inactive { cursor: default; } +/*div.pagination li.litext { + padding-top: 8px; +}*/ div.pagination li.litext a { border: none; padding-right: 10px;